I don’t mind the fact that the same music is used a few minutes later, but if something better can be found it’d definetly be an improvement.
And I agree that the “They’re here.” from Maz needs to be cut now. But I’d keep “Those beasts.” as a reaction to the First Order bombing the castle.