[mreid]

One of the small ports on the water pump is your thermostat bypass, so I hope that is still connected. The intake manifold is best blocked with a sealed npt plug. That leaves the heater port on the water pump. I've always like the npt tap and plug approach.