I should clarify one detail about my leaving Geico. When I spoke to a rep about increasing my agreed value post-re-fit, I was told that existing customers are grandfathered in even if their boat is currently becoming too "old" to qualify for a new policy. Any significant policy changes and they would probably still drop me.
Having had the experience just a few years prior with Geico where they unilaterally reduced my Agreed Value with no notice (and then restored it only when I complained), I knew that they were untrustworthy. Structurally untrustworthy.
Post re-fit, they would only raise my value partially to where it needed to be to protect our investment. After all, insurance exists to protect an investment, and in case of a loss, to restore me to where I was pre-loss.
A secondary "detail" is that I had a thorough survey done, with comps for establishing value, before we launched. That document helped a lot, IMHO. The new insurer liked it, anyway.
After all the business of the insurer is reducing risk, and a restored EY-built boat has less risk to them... so they presumably look forward to keeping my premium $ in their reserves.
(Imagining insurance company nabob resembling Scrooge McDuck, swimming around in his/her "reserves" money bin... ! )