Perhaps you could restore gravitas to the Jabba reveal by remixing the Boussh and droid arrivals.

If Boussh is a bounty hunter delivering Chewie why does he come in guns blazing anyway?

You could still have the grenade method of price negotiation but just have him turn up to deliver his prey and things turn nasty when he doesn't get the agreed price.

The scuffles might be recycled as attempts to escape the new guy with the bomb once things get hairy rather than trying to stop him from getting into the room in the first place.

When the droids turn up it could be in the middle of Jabba's strip show and having Oola drop then would give the droids more of a reason to be fearful.

But that would mean that the droids must still turn up before Leia's failed attempt to revive Han which wouldn't fit in with the idea of Luke rescuing a failed rescue attempt (unless a clever lad or lady out there can work out a way of reconciling the two concepts).