All boats mentioned are good boats. However, from your previous posts the fun factor may get lost with too much boat. Things like forgetting the dagger boards down can ruin a marriage. Sometimes they stick as you beach etc. If out and out performance is not paramount, you are not class racing (much) and money not too short then the P19 looks good with centerboards. Otherwise the humble P18 is lots of fun, tough as your P16, and cheaper(about as fast as p16 upwind, actually a little faster with your weight, but won't die on you with a crew of four or so). It rigs up just as quick too.