Sounds like ya sorted though can share my thoughts..

I have been riding ClearWater Surfboards for the last 4-5 yrs both kiting and surfing. Steve Del Rosso shapes a really good board. And is a very approachable and knowledgable shaper.
We have been working on a few different designs over the last few years and i reckon the boards he has produced are awesome.

In the metro i would highly recommend going to future fins over fcs or glassed in fins. And also look at adding extra glass on the deck to prevent heel marks etc.

If you do go down that path I'm sure Steve will be able to design and shape you a specific board for how you ride.

Good luck