I’m working on a reordered bunker sequence. For me that’s a low point of the movie, and looking hard at the footage we get, it seems like the original idea was a bit different.

So as I have it, the rebels give themselves up to attract all the imperial troops, setting up an ambush.
There’s footage to support this and even dialog (Han telling 3CPO to “stay here”, the Ewoks talking to 3CPO). Fan film footage of hidden rebels can be used here.

As a result of the ambush the Empire goes after the Ewoks, and you get the door opening sequence.
Then they infiltrate the bunker (extended sequence) setting up the charges. Once they set the charges up, it blows.

Overall it makes sense and our characters look smart (even the Ewoks).
Above all, you get the notion that the battle moved somewhere else, and not that the Ewoks defeated the Empire.