Luke also seems to have gone through at least some more training at the start of ROTJ. He’s much more of a novice during his duel with Vader in ESB. It makes sense that he’d have finished his training with Yoda as soon as he could so he’d be ready for Vader next time.

Ideally, for me, the sequence of events would be:

Opening crawl, establishing that Luke is finishing his training while Leia and Lando make plans for Han’s rescue upon Luke’s return.
Vader arrives at DS2, meets Jerjerrod.
Leia as Boushh sells Chewbacca; edit out Threepio or recolor and redub him.
Luke and Yoda; Yoda dies.
Leia rescues Han and is captured herself; Han in jail with Chewie
Luke and Ben convo, probably shortened; Luke leaves Dagobah
The Emperor arrives at DS2
Reinstate deleted scene of Vader communicating with Luke and Luke building his lightsaber
Droids go to Jabba’s, deliver Luke’s message (shortened, add Leia reactions, no “favorite decoration” Han on the wall)
Droids conscripted into Jabba’s service
Luke arrives at Jabba’s

And the rest of the sequence of events play out more or less as normal.