I you think about it, it would have been incredibly easy not to have had Khan in the last movie at all and still have the movie be essentially the same.
John simply remains John.
No "revelation" in the brig that his real identity is Khan, lose being from the past, but keep most everything else.
Then there would have been no rip off of TWOK.
Maybe lose John's speech impediment too.