Re: Angry at my surveyor....
On the plus side that sounds like a pretty thorough survey for an insurance one. I pretty much dictated the last insurance survey and paid $450 for the privilege.
We've had issues in the past with survey wording and insurance-mandated "30 day" time frames that were inappropriate (bought in late Oct, and had to reseal portlight lenses within 30 days... in Vancouver - the Wet Coast - wasn't going to happen) Ended up changing carriers.
I'd try for a wording edit..
1984 Fast/Nicholson 345 "FastForward"
".. there is much you could do at sea with common sense.. and very little you could do without it.."
Capt G E Ericson (from "The Cruel Sea" by Nicholas Monsarrat)