Who makes a decent gas water heater (40 gal. gas)?

Our RUUD Pacemaker gas water heater lasted an astounding 17 or 18 years, but finally started leaking. I saw loads of complaints about Ruud/Rheem water heaters. It seems in about 1998 or 99 the quality went in the toilet so to speak. We are looking for another 40 gallon gas water heater. Who makes a decent one. I would go with a tankless, but I do not get final say, and I do not want to stay here in this area any longer than needed. Who makes a decent water heater?