Both the wave and the gateway are going to be major disappointment in terms of performance after the nacra. I've sailed both and hated them, they both feel slow. The wave might be fun if its blowing 25, but otherwise its boring.

Get a righting bag, and a power pole for the nacra. If you are still worried about capsize add a float to the top of the mast when you are alone.

Sell the 14, upgrade the sails on the nacra and add a asym spin. You'll still have money left over.

Bill