Reworking the original crawl can fix the reordering of the Tatooine and Dagobah scenes. A new crawl entirely isn’t really needed.

STAR
WARS

EPISODE VI
RETURN OF THE JEDI

Luke 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.

Little do they know that the
GALACTIC EMPIRE has secretly
been building a new armored
space station even more powerful
than the first dreaded Death Star.

When completed, this ultimate
weapon will spell certain doom
for the small band of rebels
struggling to restore freedom
to the galaxy…