If you sail boomless, you'll need to put on a positive rotator. I don't know if the 5.2 has one or uses the typical mast rotation setup.

I'd recommend not using a bigger jib, as it will only make the bows dig in harder and faster. Keep using the nacra sails, as you need to get to know how to trim them correctly.

Put the H16 sails on ebay.