Are you anywhere near this boat
You might find this Jeanneau Sunfast 32 to fit the bill for what you want. These have a fairly nice interior for cruising, yet being a sunfast vs a sun odyssey models, they have a better performance rig, keel etc. If you can find a SF35, that is another slightly bigger option.
Major difference tween the SF and SO models, the SF's have a 7' draft, mast ~3-4'taller, +50# of SA, main traveller cockpit mounted vs cabin top, genoa tracks are line adjustible vs pin stops, cabin top is 2 winches vs 1, and cockpit genoa winches are one size larger for the SF vs SO.
Personally from races are locally, in my fleet is two Cal tall mast T2's, my jeanneau arcadia, a couple ea Cat 27 and 30's along with a 28mk2. The cats and I except the 28 have 10+ yr old sails, the 28 new this summer. The T2's are fairly new, ie last 2-3 yrs. The T2's are always in front, then typically me, then the cats. I should be faster than the T2's, but with 22 yr old sails, ablative bottom vs hard, and lack of experience in boat vs the T2 skips with 10-20 yrs owning there boats,........what can I say. But generally speaking, the cats will perform a bit less than a Jeaneau and you Cal IMHO. The SF32 has a 126 PHRF, the SO's about 10 sec slower, depending upon the 6' or 4.5' Shoal draft. The SF 35 is 102. The SO 35's locally are in the 120's
Not sure if you have looked at these, or if the 99K is more than your budget, but this is an alternate to the cats. I personally feel a step up, then again, they might be equal, with a different ambiance for interior etc.
Good luck finding a new boat.