I'm not sure if this would work, but I don't see why not. Put a tee in the water pump opening for the heater hose and run the bypass hose from the thermostat housing to the tee and from the other open end of the tee continue on to the heater core.
Maybe someone else can tell us if this would work or not.
