The following suggestions relate specifically to the Cav36's. Further suggestions or comments from owners are always welcome...
When you order your next mainsail, consider raising the tack end by 300mm.
This will mean you won’t have to worry about decapitating your crew in a jibe, and will make almost no difference to your sailing performance.
Also consider just two reef points, one at the standard third reef point and the other half way between. This will allow you to have both reef lines permanently set up and to reef from the cockpit.
In a gale the Cav36 will power to windward under a storm jib on an inner forestay and a fully reefed main. Its wet an noisy, but you can make remarkable ground to windward!
The Cav36 will hove-to comfortably under a variety of rigs. In a good blow try the storm jib on the inner forstay, with the running backstays tensioned on the winches. Helm lashed to leeward, jib as flat as possible and cranked to windward, and you can go get some sleep!
The standard genoa, with its huge overlap, was designed for winds up to 12 knots
If you are a cruiser who likes to motor in light airs consider a J1.1 jib, with a high clew and a flat profile so it will roll away and reef down well. Your boat will be slow in light airs but easily handled in 15 to 25 knots.
Build a low curved bulkhead just at the front of the motor to keep the main cabin underfloor dry
Put a one way valve on the bathroom sink drain so you will not flood the head when you forget to turn off the gate valve.
Inflate car inner tubes in the anchor locker to prevent it becoming waterlogged when sailing into a seaway.