No heater output would suggest air or another obstruction in the coolant flow. This "bypass" switch you're talking about; is it a manual electrical switch to override the temperature switch on the bottom of the radiator? What was the propose of installing this? The OEM setup, properly functioning, works fine.
Did the cooling system work OK following the new water pump installation? Have you opened the system since it was performing satisfactorily?
The only modification to the factory setup I recommend is the installation of a "flushing tee" mounted at the highest point of the system. It looks like this:
Its purpose is twofold: It allows the attachment of a garden hose which uses household water pressure to reverse the flow and purge (flush) coolant from the system. It also allows you to "top off" the coolant after mechanical repairs to the cooling system. You fill the radiator thru the pressure cap opening, fill the coolant reservior (overflow bottle) to the recommended level, then use a funnel to slowly add coolant at the flushing tee until it overflows there (all bubbles gone). The heater valve should be in the full "on" position during this process.
If this tee is unavailable where you live, you must raise the front of the car to such a height that the pressure cap opening is the highest point in the system. There are other links to this procedure. Good Luck!