Dave in Denver wrote:

I picked out a High Recovery water heater that also has extra
insulation and a Mag rod (not alum.).
- Has 65kBTU rather than the standard 40kBTU.

It might be more efficient with the smaller burner.

Nick