If you are waiting for the water heater or furnace to die before replacing, I can guarantee you that will happen at the most inopportune and inconvenient time.

And you will be without hot water or heat for days. That is no fun.

As Barney Fife says, nip it in the bud.