Fixing Star Trek Into Darkness

Just a few ideas that would make the movie more palatable to me (and probably others).

• General outline: The movie starts more like Space Seed (the TOS episode in which they find Khan) and merges into a Wrath of Khan-style battle of wits, not brawn.
• The Enterprise is on its 5 year mission (already!). The sleeper ship has crashed on an asteroid, there's a space fight to get to it first between the Enterprise and Klingons (they were used poorly in ID but I'd like to give it another chance).
• The pods are rescued, not sure who's in there, they start booting them up.
• The first person they revive dies, but not before telling them to "do stasis pod #42" (Khan is in it).
• They wake Khan up, they don't know who he is, he hides his identity and acts generally friendly.
• Inspection of his genome reveals several things, namely that he's had a lot of cosmetic surgery and genetic alterations both to his looks and abilities. It takes a while but McCoy along with Dr Marla McGivers (geneticist, no longer a lieutenant or historian) who is able to reconstruct what he would have looked like.
• They figure out he's Khan Noonien Singh, and they establish that he's a dictator (for the viewers).
• And this is where it gets more into Khan and his gang trying to take over the Enterprise, and the crew getting on a smaller ship, cat-and-mouse game like WoK.
• And Khan's ultimate goal is to reconquer Earth (motivation) but the setting isn't Earth.

So, in short there is no more:

• Dr Marcus
• Giant-sized starship that's just the Enterprise but bigger
• Conspiracy within Starfleet
• Crashing a ship on Earth
• KHAAAAAN!
• Resurrecting of anyone with Khan's DNA