I hope you got the water heater issue sorted out. I keep wondering when ours is going to give up the ghost. My husband used to clean out the mineral residue from time to time, but he is incapable of doing that any more, so it hasn't been done for years.