This guy sounds good and has a nice website, but I called him and his machine said he was closed untill October. Not much help here.http://www.ferrarilife.com/forums/showthread.php?t=7155&highlight="water+pump"
Here is one mentioning a man who rebuilds water pumps, may or may not be what you are looking for.