here's an idea for the ending:

http://www.youtube.com/watch?v=VU2jga_fbnE

thinking back to your ROTJ edit, perhaps it would be an appropriate bittersweet finale. by the time we see anakin cremated in a similar way, its like he lived up to qui-gon's legend.

music would need clearing up, but you get the idea
yoda talking to mace is really unneccessary i think. plus the whole rule of the two is a bit silly in my opinion
i had a go at making a matte for the pan up. that could be worked on a bit better
you could lead the scene with the naboo mourning scene from ROTS perhaps
also played around with reversing some shots for the motion differences with bits placed on top.

was thinking earlier aswell. in KING KONG. the film both starts and ends in New York. but there are big differences in the time of day and decor between the two visits.

could you perhaps consider our first outing in naboo to be at night, then the second to be in the day? or perhaps the other way around?