I have heard good things about Tennessee Valley Marine but I also know they charge on the high end for labor.

Have you ever considered doing the water pump yourself? It is super easy on every outboard I have owned.