I believe that IF Floyd hasn't got old in his time away and he comes back looking his usual invincible self in the ring then yes I think a fight with khan will happen. It would make sense.

It'd be a boring chess match but floyd would win an easy UD.