you should really check out the rotj fan o matic. there is a really good edit of the rebel briefing scene. luke is assumed to already have joined the fleet, so i guess his xwing would just follow the falcon.
http://www.youtube.com/watch?v=f19SnqUkAlA&feature=channel
love the idea of the saber reconstruction on dagobah. would be great!