I think I prefer the first way you had it, with the theme coming in slowly before we hear the main part as we cut to Rey and Kylo. I then added the first part of the music afterward to bridge to when the existing music comes in the scene. I do plan to turn the volume up, especially toward the end.
And that’s great, kewlfish! I’ll add them to the timeline once you’re happy with the crackle across the whole movie.