You're sure it's the waterpump and not the thermostat? Do you get heat from the cabin heater when the engine is up to temperature?