teambnr where ever you decide to take your boat do it soon! The quicker you get it in, the quicker you'll get it back. The first few days of good weather always seem to bring on boating fever.
I know OC is a ways from you, but I hear MPD is tops for pump work and also there is a good engine shop a couple of doors down from him. Talk to HBjet about that.
I'd make the rounds and talk to a few shops. If you don't like their attitude before the sale it probably won't get any better after the sale.
Happy boating!