Now I feel like I need to add something to my earlier post. IMO most wave kit is to some extent more difficult to sail, even the hybrid freestyle-wave or freewave, then a purely freeride kit. On top of that with a freeride and even freerace equipment you can learn to do all the basic stuff that a typical everyday Joe and Jane would learn in the course of their entire windsurfing “career “ like all the basic tacks including Heli, all the basic jibes including Duck and all the basic jumps including Forward loop. So the question comes down to: Are you going to do any sort of wave riding at least a few times in a season?
If the answer is more likely not, because for example:
1. Lake Michigan and it’s crappy wave conditions is too far for you.
2. Wave riding in Lake Michigan and it’s crappy wave conditions is extremely difficult and has a high chance of inflicting a significant damage to body and equipment
then you won’t ever need anything with a wave in it’s name.
Now the board list that you first posted looks a lot better to me then my first wave biased impression. Everything except the Shark 120 and Atom 120 that are too big and too close to your current board will work for you and in case you want a more manoeuvre oriented board choose the Allride or the Gecko, or if you want more speed oriented one choose something like the Fire Ride or Goya Bolt. For sails if you like the Goya line then choose the Nexus for manoeuvre or Mark for speed.
Don’t complain now that I didn’t make it a lot more difficult to you
PS: If you choose speed orientation, I’m recommending you my favorite Sailworks Retro and you can find used in good condition here :
www.sailworks.com/the-gear/used-gear/used-sails.html
Best masts for the Retro are Joystick and Lightstick for 460 and up and Carbon Twill or Sumo for 430 and down.
Used ones here:
www.sailworks.com/the-gear/used-gear/used-masts.html
Take a very close look at the Hucker line also! For me it is a mystery that I never had a chance to try, but it looks like a hybrid line that’s very good for jumping according Sailworks. Probably a very good match to hybrid boards like the Allride and the Starship, but I’m only guessing here.
Also check used Goya inventory, if you haven’t already:
goyawindsurfing.com/team-gear/