RE: The Ewoks (that aren't in ESB:R) as I've said before it makes more sense that they have already fought the Imperials (eaten some) and are planning to attack the bunker already (which explains the already laid traps).

My preferred structure is.

The Rebel attack team attack the Imperial troops officially stationed at the base (which matches what we currently see in the film).

The entire legion of best troops turn up and capture the rebels (which would mean a lot more troops on top of the ones the Rebels were expecting).

The Ewoks trigger their traps and attack the troops freeing the attack team.

The Ewoks and the attack team join forces against the Imperials and it's not an easy fight.

I would consider changing the pitch of the Ewoks voices so they sound less cute too.