JJ, I don't think there is a requirement for the two sides to come together. Things have been fine with two class associations. Hobie sells boats to both. In that respect, it
does parallel the Tiger/F18 - if you buy a Tiger, you get a shot at two national-level events every year. If you can get that sort of time off, that's awesome.
A solution would be some ideas of what will work.
Your premise is that there is something broken. I don't see anything wrong with the status quo. Wave owners can join and race in both associations, and the differences are minor enough and the boat is simple enough that going back and forth between the two is
likely as simple as swapping a sail. I see only winners.