Personally that version of Rey’s theme mixed with Ben’s light side theme that plays when Rey’s resurrected is one of my favorite pieces of music across the entire film, so I’d leave it as it is. The actual kiss could be rescored, though.
Yeah, I’d leave everything the same other than the scene changes I’ve made and the rescore after Rey says “Ben”, then have a second silence and the add the build up the first crescendo across the stars but only use a few seconds before fading to Poe in X-wing celebration.
It works, it’s nice BUT I’m still split on it just remaining Padme’s song.
But then the whole of TROS didn’t stick to the rules I.e. Yoda’s theme with Luke, Leia & Luke theme with Lando & Jannah etc