Water heater needs replacement - will recomend to warranty company that we swap out the unit and perform necessary code upgrades.