Water pump engine mount 440

very true - eliminate all things that need replacing but start from the cheapest. check radiator before you move into the heads.

i'd switch out the water pump and housing to be absolutely sure - take some photos of the engine i am corious to see the set up you have and how you have the heater plugged.