I’m in the process of doing both at once. I’m getting rid of a non-sealed crappy inefficient heater and replacing it with a 95%+-efficient sealed combustion, combined heat-and-hot-water boiler.