Heater replacement - advice needed