high labor for water pump/thermostat?

[Gilles]

Sorry to hear this bobaachaar, but unless your mechanic accepts replacing the pump with the right one.. I would offer buying the OEM pump and he puts the labor to replace (after all it was his fault..)

If this does not work out, perhaps now this is the time to learn to replace your water pump with the correct one, as long as you save the new precious coolant your additional cost would be for the OEM water pump.
Replacing the water pump is not complicated as long as you take your time, there are plenty to DYI advise on this forum.

I would volunteer to help you but Orange County is a long way from San Francisco.. perhaps another member that lives closer?
.