Ken, I rember reading this before, and I'll admit, it pissed me off too, butI feel that them taking care of this for you is very commendable, and yes it is frustrating as hell to miss out on any boating time, but that's how things go sometimes. The motors will be new, and matched, dyno'ed and now porting the heads, they will be better than ever. When you get the boat back, and look at it in hindsight, it's not too bad, but I understand your point. It sounds like you chose a great performance marina to use, most wouldn't admit fault like that. They have done the right thing in my mind, just not on your time frame, which is always how motor rebiulds go, especially at this time of year.
The mechanic learned a valuable lesson, as did the marina and alot of us on the board about silent choice and supercharged motors. I would bet the marina makes it very clear to any future mechanics to not make this same mistake, I'm sure it put a nice dent in thier wallet for this simple mistake. I hope you get it back soon, and hang in there, everything will be O.K.