3PO being behind Jabba when Han and Leia are caught was another issue I ran into when trying to restructure the first act back when I made a ROTJ workprint.

I wonder if you could potentially reuse the shots of Boba Fett from the Bounty for a Wookiee scene, and have Boba be the one that catches Han and Leia. You would avoid the goofy fact that apparently the entire palace is quietly hiding behind curtains during the entire scene, you’d avoid having to paint 3PO out of the scene, you’d give Boba a little bit more to do, make him look smart (seeing through Leia’s disguise), and you would conclude the scene more quickly this way.