Mat,
I would also base a decision on what is going on with the club racing, at the "home" lake. Who's racing what? And is that one of your choices in boats. Do they race handicap? Do you want to race handicap or OD? If not, do you have the
right lake?
I would consider leaning towards a bigger boat (F18 or 20) only; if you can leave it stored, mast up, and you've got a willing crew, when you go off to the shore or races, for set up and take down.
I made the mistake of buying the boat I "thought" I always wanted (and it's a great boat) and then found out noboby races them anymore. It's very frustrating to travel long distances for competition.