BY-passing heater

yes sir
just run a short section of hose from the waterpump outlet (the hot hose on the heater) to the return port on the intake (cold hose on the heater) and remove all the heater hoses and plug them at the firewall