Reworking the first paragraph of the original crawl can fix the reordering of the Tatooine and Dagobah scenes.
STAR
WARSEPISODE VI
RETURN OF THE JEDILuke Skywalker has returned to
the planet of Dagobah to continue
his training as a Jedi Knight.
Meanwhile, his friends have located
Han Solo at the lair of the vile
gangster Jabba the Hutt. But he
left his friend hanging on the
wall for six month…Meanwhile Darth Vader went to
Tatooine to set a trap for Luke
knowing that he will show up
to save his friend. Vader
waited five month but Luke
never showed up leaving his
friend hanging on the wallVader finally left to report
to the Emperor, who sent him
to speed up to construction
of the new armored space station
more powerful, then the first
Death Star … when Luke
finally showed up.Fixed it 😉
Let’s set ROTJ a month or so after ESB with the reordering, the crawl could still work. Lando and Chewie found Han within a week or two and Lando applies and gets a job at Jabba’s to have an inside-man. Luke got word of Lando’s plan and went back to Dagobah to confront Yoda and Ben about Vader being his father on his way to Tatooine, he needs to know for sure. Leia gets restless waiting for Luke to get there and decides to go in with Chewie and get Han out herself. Luke senses this and leaves for Tatooine right away. The movie then continues as originally scripted.