I did suggest on the edits idea page that Luke went straight to Dagobah after ESB and finished his training (Yoda died with his role complete) so he would be a skilled up to take on well planned rescue but Leia having the Skywalker impatience doesn't wait for him.

She causes a big scene. gets demoted in the Rebel ranks and presses Chewie and Lando to pay certain people to get them into the palace without Luke or the droids.

Luke sensing Leia in peril also gets captured trying to rescue the rescue party (in the ANH mode) using the droids as Trojan horses to get his new saber into the palace.

Artoo uses his hacking skills to get himself onto the barge.

That way everything can play out the same but it's tweaked enough to feel plausible and add character development.

Fett need not even be there or he could be taken out by Han using blind instinct to deliberately hit him not blind luck (which would play on an ironic reference to the training scene in ANH where he mocks Luke for trying to hit a target blind).

It's a cockup up there with little Annie blowing up the droid control ship by accident.

The sequence (the whole first act) is so 'almost there' that it annoys me that instead of making the sequence make sense Lucas does stupid things in his SEs like adding Vader going "Nooooooooooooooooooooooooooooo!".