I always found this to be a very interesting quote from Rian on the music in the scene:
https://www.reddit.com/r/StarWarsCantina/comments/buzzdo/french_interview_that_clarifies_how_rian_johnson/

I do wish Rian had requested a new theme for their relationship instead (the biggest musical missed opportunity all trilogy), but I get the reasoning for the Force theme, which is really the all encompassing ‘fate’ theme (and perhaps if it wasn’t used as much in that film it’d feel more momentous), and which is ultimately mirrored in the moment they join forces.

That said, I think your edit works really, really well, and makes for an excellent change.