Why do you consider the 16 "troublesome?" The hulls are easier to repair than rotomolded models. There are parts galore for the 16. Hobie has sold over 100,000 so there's plenty of people to help you set up the boat properly and provide plenty of hints on how to sail it. The 16's are not that hard to right if you have a decent righting system.

The Wave is a good starter boat. They're not fast unless you Rick Whiteize it.

Find a dealer that will let you try both and then make your decision.