Actually, what I've seen of JasonN's ROTJ edit ("Last of the Jedi"), it seems that he's got a lot of the same ideas I do. He's also managed to do quite a good job with that very scene simply by removing the "sister" comment, making it seem as if Luke is in love with Leia in the same way that Han is. In fact, I may scrap this project altogether if JasonN's edit turns out as good as I think it might.
Then again, he's not rearranging the opening like I plan on doing ...