I'm watching X2 on FX right now, and I have to say it's fitting in nicely with the story of that movie. Obviously the Weapon X sequence is different, but storywise it works.
Weren't the Weapon X sequences in Wolverine's head in X2? His emotional trauma could have had an effect on his memory of events