I don't think combining Intervention and Holy Sheltron would fix button bloat. Yeah it makes sense since they both cost gauge and do similar things, however I would now have Holy Sheltron on my bars twice, one being a macro so I can quickly use it on the other tank. This is how I have Heart of Corundum, The Blackest Night, and Oblation set up.

Removing Shield Bash won't change anything for me since I don't even have it hotkeyed due to me almost never using it. It's just set off to the side, just in case.

I think a better option would be removing Holy Circle and just giving Holy Spirit 50% AoE falloff damage.

Or maybe buff the potency of Resquiescat and give it AoE damage, put it on the GCD, and have it turn into Confiteor after using.

Or turn Goring Blade into a trait that makes Circle of Scorn deal an additional 250 potency to your main target.

I dunno, just free up a button or two, SE, please.