I would say Khan as he seems to improve fight by fight and corrects his mistakes.

Questions about his chin remain to be answered but dont forget De La Hoya was dropped afew times early in his career but his chin was never a problem as his career went on.