The more I look at that rule, the more on board with it I get. Terminators and Custodians needed a buff, there is no argument there. What's the simplest way to buff them without a complete redesign? Change the Storm Shields.
My only problem is that I don't have enough Thunder Hammer / Storm Shield terminators! Ah well... I've always wanted an excuse to complete my Deathwing Army!