@DominicCobb - The problem I've been having with that is Luke is wearing different outfits in each of those scenes.

The solution I am playing around with right now: Luke's initial plan is to meet up with the rebels. He gets in his x wing. R2 beeps. "No, I'd like to keep it on manual control for a while." Later, we cut to him crash landing on Dagobah. As he get's out of his x wing and looks around we hear Obi-Wan, "Luke. The Dagobah System. Here you will learn from Yoda, the Jedi Master who instructed me."