Could it be established that Anakin and Padme have actually kept in touch over the ten years and once they meet up again in AOTC they realize that they are meant for each other?
If something to this effect could be pulled off convincingly, then you *could* have them get married on Naboo after a few of the love scenes. Anakin could then have the dream about his mother and the movie could go foward from there. So Anakin and Padme would be a married couple through the rest of the movie. You could then show Anakin leaving with all of the other troops and whatnot at the end.
I don't know if I like the idea...or if it could be accomplished...just a thought