Crazy thought, but what if we have the 'roll in the hay' scene from the middle of the movie and move that to the end? They return to Naboo anyway, right?
This is an interesting idea... but if you want to look at it big picture, do we really want Luke Skywalker to be an illegitimate child?