I’m leaning toward maybe keeping the quiet bit while they stand off, then pivoting to the original music when Kenobi says “I will do what I must”.
I gotta say, I really like what you have as you’ve posted it. I don’t think the original music works that well there, how you’ve mixed that version of Battle of the Heroes maybe only needs the tiniest of nudges downward at most, and probably not even that. It’s not a subtle piece (it isn’t a subtle fight) and the fact you’ve managed to make it fit this sequence as well as it does is quite a feat.
For what its worth, as a person who REALLY keys into the music choices and music editing, I think you’ve done a good job here with your choices, and how you’re executing them.