Khan's chinny, but I think it would be wise to match him with a journeyman who can punch, to build his confidence, and develop the defensive skills.
It's a risk, but it's not as risky as leaving it until he has to fight a guy who can punch AND is world class.