It could be that the pump isn't man enough to displace air in the heater matrix, but try reverse flushing the heater first. Blocking of the air side can be tested with the fan. With the engine hot, the heating on full and the fan on full, do you get a lot of cool air (water problem) or not much air but hot (air flow problem).