Here’s a rough ground battle sequence, with the changes I described above.
This needs better sound editing, but it’s good enough to get the idea of how it could work.
Of course, you would be cutting away from this to the space battle and throne room.
Extra footage comes from the Ewoks movies and the Bucketheads fan film. Explosion shots are from TFA.
Also using the “bunker redux” reedit by section33.
https://drive.google.com/open?id=1-l1lu02ANcqcoiptLZs9F2BOPL8vBX1n