Thanks to all who replied. Opted to replace the failing heater with a
similar unit. Looking at the tankless variety I could not see where the
higher initial costs would be offset by efficiency's in any reasonable time.