You're making the fannish mistake of overcomplicating things, I think. This is why I say, stick Khan's first appearance in as a slow-burn subplot, then follow it up a few movies later. It's already going to be different, purely for the fact that Kirk will be much, much younger than he was when his previous self fought Khan.