darth_ender said:

To Aalenfae and Angel: how difficult would it be to change the background during the lightsaber construction scene? What I'm thinking is compositing Luke into a Dagobah-like setting. This would fit in right after Obi-Wan's conversation with him: "Bury your feelings deep down, Luke. They do you credit, but they could be made to serve the Emperor." Cut to Vader in meditation chamber reaching out to Luke, then back to Luke in black robe constructing saber, but still on Dagobah. Here he could be preparing for the duel Ben just told him about and brooding in his thoughts as well. I'm not sure I would still keep this, but it seems like it might be an interesting way to keep the deleted scene. Also, how hard would it be to remove his lightsaber from the preceding Dagobah scenes then?

You could just start the film, with Lukes X-wing approaching Dagoboah, have him in the cave he fights the Vader vision in building his lightsaber (establishing shot possibly used from ESB). Spence's edit cut Obi-Wan Ghost, and Yoda confirming Vader is Luke's father, both are great scene's IMO.

I'd suggest having Luke kill Boba Fett if possible...