Yeah, I’m definitely trying to avoid the choral parts, at least. And TPM, between the concert track and the various uses throughout the climax, has a variety of statements of the theme to work with (although this poses other challenges).

The trick is really that, when editing the scene in isolation, it’s easy to lose track of how it feels in terms of the larger picture. So you can cut it one way and it’ll seem like a great fit, but in context it’s all suddenly bombastic out of nowhere. So… working on it.