Screw a tank. Go tankless and cut your power bill a good bit. Or swap to gas tankless. I think Spire is offering a $600 rebate.