Keep Luke on Dagobah. In ESB he goes from 100% not going to help them and obeying Yoda, to fully packed and leaving in the next scene anyway?!? How about he only leaves after Yoda dies or when Han is Frozen...

You could cut straight from "I love you... I know... wookie howl of anguish*" to Luke dropping the stones? He never goes to Bespin and goes off after Lando, Leia and Chewie's desperate persuit of Fett. That would explain why he turns up late to Jabba's palace.

Remember after Hoth, Luke and Han/Leia are essentially in two totally different films. There's no reason why they need to meet up again for 2 minutes before the end of ESB in your version?

That only leaves the Vader/father reveal right? Kenobi's chat about Anakin could maybe be re-edited to reveal that. Or another method could be redubbing Vader's lines from ESB over the final battle in ROTJ. When Luke is hiding in the throne room, just before losing his sh*t and attacking Vader. Swap the line from "...perhaps she will - Nooo!" to "...I am your father - Nooo!"

Then maybe Ben's "Why didn't you tell me?" chat could take place on Endor between the start of the Ewok celebration and him burning his father's body. The Dagobah footage can be converted quite closely to Endor. I know because I've tried it myself.