That is quite a condrum... I Don't think that any of these boards are really suitable for an intermediate-advanced that wants to do enjoyable sub-planing & upwind cruising.
For this you simply need more length, and a good daggerboard. Starboard Phantom 320, or Kona One would be good. Maybe also RRD Longrider or Tabou Windstyler?
Any chance that you would be able to order a board with a better fit if you allow the price to raise slightly? At the end of the day shipping from further away tends to be reasonably affordable (especially if the product is what you need!). Maybe Windance would have a RRD Longrider?