Insurance ugh!

[bumpdraft]

So, I decided to refurbish my boat. I sold my old motor, rather than storing it. The shop is supposed to start the work on the boat next month. Meanwhile, I have been searching for a new motor and estimated times are anywhere from 8-18 month wait. I got to thinking about it and it crossed my mind why I was paying for liability and other things that added to the cost of insurance, which was good for about 5 more months. So I decided to call Boat US/ Geico agent to ask the question. So the agent was most helpful and my insurance has now been canceled. It seems that they only insure operable boats and since I sold the motor, it is not usable. She also informed me that they will only insure a boat that is less than 40 years old and by next year it will be 40. I further surmised that when I take it to the shop, it will not be covered for theft and if I had not told them about the motor and had a claim, they would deny it.
I was wondering if anyone had suggestions on insurance companies.