The 920 wouldn't be enough upgrade. It may be finished nicer but it's the same size boat. If you want to make her more comfortable you should look at another mono. A Maine Cat 30 or a Gemini might also fit the bill but after sailing an F-boat you'll never be happy with the way they sail. A mono has a better feel under sail than a cat, but a tri is a "spoiler" once you've owned one.

Maybe the answer is a super high performance trailerable (under 20-ft) sailboat for those perfect sailing days, and a mono cruiser for vacations.