id not change the heater core. the engine swap is less work lol but really, its a pita to change, not worth doing unless its leaking.

id flush the piss out of it and call it good.