I've been thinking about this a little over the past weekend and trying to work out if it would work out well enough if the the scenes were re-ordered. what i was thinking was something along the lines of...

We see the paramount logo sequence in reverse [fade in from black] the stars fly away back up through the clouds and we pan up to see a starfield. We see [a new version of] the main titles appear followed by the main cast and crew credits. This plays out to the closing theme of the film - 'A new beginning' - which starts out with a slight rendition of "Blue skies" then proceeds with the main theme of both the films and the Next gen TV series.

I thought about also adding in some stars zooming by, sort of like the start of ST6. There's a nice sequence at the start of ST1 like this with no text onscreen that could be reused.

At the end of the credit Sequence the camera pans down to see the ship in stardock being repaired. - reversing the final shot of the film proper.

Then we cut to Picard explaining to B4 that he wanted him to know just what sort of man he [Data] was - Then we cut so see just what sort of man he was, An action hero. Putting his neck on the line to rescue picard.

This could be done in a way to keep things a little mysterious. I was thinking that at this point the plot could move forward from the big rescue sequence to the end battle and beyond where they toast absent friends. Along the way i'd cut in 'flashbacks' to reveal things that had happened earlier as they become important to the plot - if at all.

This is just a thought in terms of restructuring, without really considering what I would add or remove, And I would remove a lot. I'd really try to cut back on a lot of the ST2 moments. Data would not "live on" in b4, He'd just be dead.