Hi RRK
If you like the feel of a rocker board like the custom but just want it to go upwind better, have a look at the Tona Pop. Gets going earlier than the Custom goes upwind better and has the best pop of any board I've tried, also just eats up the chop.
Works well in the waves too, it is quite lively as it has a lot of curve to the plan shape combined with a high rocker.