The reefing conversion might be worthwhile. Note that, depending upon the age and cut of your
sails, you might need to have a foam luff pad or
rope sewn into your
sails to take up some of the sail's belly when you reef.
We sailed a
Cal 2-29 for many, many years and generally found that when reefing became necessary, a single-deep-reef in the main and full genny (135) worked well up to about 22-23 knts onless one is beating hard to
weather. Beyond that, we'd furl the
genoa and
work under
single reefed main only. The yacht's fairly light and sails pretty well under the main only, if necessary.
Good luck!
s/v HyLyte