Simple, rough storyboard for first half:

Opening crawl is more dramatic. It sets up that Luke is on Dagobah finishing his training. Show Luke with Yoda dying and subsequent discussion. Show conversation with Ben afterwards. Show X-wing leaving Dagobah (flipped and slightly altered shot from ESB could work). Show Vader arrive at DSII, talk with Jerjerrod, etc. I'd love to include deleted scene with Luke's construction of lightsaber, but continuity would need to be fixed with Luke on Dagobah, and it's not really necessary. Show 3PO and R2 approaching Jabba's Palace and go from there. After defeating Jabba, use restored deleted scene of sandstorm (would require dubbing, but with the noise of the storm it might be easier to get away with this). Remove "promise to keep" line and Luke messing with hand. Show X-wing and Falcon leaving Tatooine and include a couple lines about "meet you back at the fleet" but remove now redundant lines. R2 beeps, Luke looks at hand and puts on glove, dark music, possibly slow, soft Imperial March, Luke says, "I just need to do some...thinking." Cut to Emperor arriving at DSII. More to come later.

The reason I don't think the saber construction would work in this plan is because Vader communicates with Luke after he's already talked with Obi-Wan and should already have had time "to do some...thinking." I really like this line because it would explain Luke's late arrival to the attack planning meeting and show that in spite of his successful defeat of Jabba and Co., he still feels torn up about his approaching destiny with his old man. He's also shown contemplating already about their similarities, and it would serve to mirror his severing his father's hand and looking at his own glove again later. He's already pondering how easily he could become just like his father. On top of that, his lightsaber is already on his belt on Dagobah and therefore would have to be digitally removed.