I’m really starting to doubt that any sense can be made out of the rescue… There’s no foundation to any solid plan in the movie and to fix this we would need additional dialog and probably additional footage. I don’t think rearranging scenes would be nearly enough.

JEDIT- Some keep referring to “THE PLAN”, but the problem is that there is no plan.
It’s just a series of scenes where our heroes enter the palace and then are captured. Then, Luke gets his green baseball bat and smacks everybody off the boat while acting like that was his big idea all along. And maybe it was!