Qui-Gon needs to be at the end of ROTJ. I know, I know, everyone's pissed enough as it is with Hayden being there (which is totally understandable it doesn't make sense for his ghost to be younger.) but Qui-Gon is one of the few Prequel characters that actually resonates with the audience like the OT characters do, AND his role is important considering he's the one who started the whole force-ghost craze, and plucked little Anikan from obscurity.

That's as far as I would go in terms of integrating Mr. Jinn into the OT.