Have the amnesia kiss out of II, but use it in the end of III. That way it could tie in into SR.
Of course there's the Fortress thing in IV. I suggest its cut completely. That, and the Smallville scenes (these because of SR).
What do you say? Won't that allow II to happen less controversialy?
Its an idea, anyway...