Virgil Hunter says Amir Khan is back on track for world title glory ahead of Saturday's bout with Julio Diaz.