If you need new water heater, try the Rheem Professional series or the Bradford, they are the most reliable. They may cost few hundred more up front but will give peace of mind. We had put in Bradford (Cadillac of water heaters) in old place and it was great. In our current pad we have Rheem Pro and it has gone 7 years with no hassle. Get the one with highest R rating that will fit in your space. I believe they Rheem Pro and Bradford are only available to builders and independent installers not the retailers. I’ve found that HD and Lowes sell lower priced items.