You might give Mark Russel a call at RSR Motorsports - he was who we had intended to have do our motor rebuild on the white 944S - I don't know how much he would charge but he would be very thorough. Also, you might try Sam Kapp - Kapp's European, down in your neighborhood. I haven't used Sam personally, but Otto Silva recommends him and I think he is worth taking a look at. Or possibly Bob Bowen - Concours Autowerks - he works on dads car from time to time and I think he is capable and honest. There is also Garrity, who runs Motorsport.
No idea on cost with any of these guys, but it would be worth it to call them up and see.