Exactly - and as Starsky also just wrote:
The board that cranks upwind, will be horrible for surf - and the other way around
You can not get both - but you need to take your choices on what compromises you are ready to accept.
I would not use big fins though - they might help marginally on upwind performance, true - but for a waveboard it will fully destroy ANY wave and carvefeel whatsoever
And the surfboards are using the "shape" much more than the fins to go upwind, where you glide and ride on the edges of the board, instead of the tail - so width and rockerline and edges are far more important IMO.
Meaning, a good "modern" fish board, with not too big fins - will be able to glide well and go pretty okay upwind - and also ride waves "pretty okay".
Or a not-really-wide but longer board with a long flat rockeroutline, and very sharp edges - will also perform well upwind, and still be quite good in high winds and big waves too, but not perfect in small steep waves.
And one could go on and on !
Basically IMO, a "perfect" waveboard for okay wind and small-medium really steep or fast waves, will be the WORST at going upwind
And the best upwind board will be bad in terms of waveriding
LOTS of different choices - but always a lot of compromises you have to select !