Jedi_jra, your ending makes so much more visual sense to me, not to mention having a better story-telling sense. Lucas definitely lacked subtlety with connecting these final threads to the Original Trilogy.

Also, the static shot of Bail, Yoda and Obi sitting around that conference table onboard the Tantive never sat well with me since it was shown directly after the shot of the ship zooming into Naboo. Cinematically, it didn't match. The Tantive zooms in to land, and, BOOM!, we're on a wide interior shot of the ship with NO movement! Putting that sequence in as the Tantive actually touches down on Alderaan works so much better.