A quick suggestion, Can you possibly restructure the Jabba “plan” sequence? It seems to me there’s no plan to save Han at all. All they just do is to get captured and wait for Luke to rescue them.
I feel like that’s something that can’t be solved be fan editing