"What needs to change is the scale of the thing which is a bit flat and mundane for a Star Wars film and the tone which is light and comic which is entirely inappropriate for the climax of a film about war albeit a fantasy one."
I agree on the scale of the ground battle needing to be larger in scope. The lighter moments though arguably help balance things out considering all the stuff between Vader/Luke and Palpatine going on are quite dark and heavy as heck. However, we don't need to keep all the light stuff...maybe just trim it back a bit?