No. I have a friend in the business said I should look at Bradford-White. But, they are twice as expensive as the ones at the big box store.
In the end, I rationalized that I'd fill the next one with sediment as well before it had other problems so, regardless of brand, I'd not keep it much...