The tech determined that it was the "heater core". Even after the new pump, the downstream does not heat up as much, only in the defrost mode.

So now I only have acceptable heat in the defrost mode.

Heard it costs over a $1000 to put in a new heater core.