That sounds really well done. For the third act this is my idea.

While the bombs are being set we cut to the trench run. The very end of it where Poe gets in is cut out for later. (normally is in middle of lightsaber duel). After Hans death, right before it cuts to Chewie blowing the explosives we cut from Rey and Finn desperately firing at troopers to Starkiller firing with order 66 music coming in (or “The Starkiller”). We cut back to Chewie blowing the explosives (music still playing), then Poe comes through the hole and blows up the base. Then during the lightsaber duel we cut to people evacuating. Because if you allow th trench run later on there is upbeat music. If you cut a lot of the happy reactions from Poe after its blown and rescore it then it could improve the third act a lot more.