That is really good!
Is there a rendition of Leia’s theme (or even Han & Leia’s theme) that might work better there than another needle-drop of Burning Homestead? Burning Homestead worked in The Force Awakens because the music was tied to Luke and specifically Luke “answering the call,” so repurposing it for Rey finally doing the same thing achieved a pretty remarkable effect.
I think maybe a similar version of Leia’s theme getting used there might make more sense considering it’s her saber that Rey’s catching this time.