Unfortunately I think the ideal sequence of events is probably impossible to achieve.
You’d want to use the lightsaber construction scene, repurposed on Dagobah (as many have suggested). Then after the sail barge assault you’d want to use the sandstorm scene, and then follow that up with Luke talking to ghost Ben at his hut. And I don’t think it’d be possible to make any of that work.