I may not be the world's best hobie 16 sailor, but I've flipped the damn thing over so many times, I know a thing or two about righting it.

I find 'playing anchor' works better than trying to swim the boat into position, I often just have my crew hold the righting line to stop the boat from turtling , while I either move forward to bring the tramp up and weather-vane, or I just jump in the water at the bows, and kick moderately against the wind and waves, essentially 'playing anchor' and really just letting the elements push the rest of the boat downwind faster than the part I'm holding onto - I find this tends to work really well.

In winds below about 18kts, it's enough just to get broadside and everything uncleated, in winds above this - ( I recently righted easily on a first try in ~30 kts, shocked me how easy it was) you HAVE to get in a close reach/haul position before attempting to right, no matter how much you uncleat.

In high wind and waves, I find there's no point in even trying to bring the boat up unless you have it in close reach/haul position, it'll just blow over the other way no matter what you do; and loosing energy righting a hobie can get dangerous (especially if a nasty lee shore with rocks is getting closer and closer).

Another trick I find, and I don't know how kosher this is, is I actually use the painter a lot as a righting line; I'll often have my crew grab the main line, while I throw the painter above the hull over my head, just behind the bow tramp post, I find this lets me dance forward on the hull to both help weather vane, and to help pull the boat up.

Anyway, hope this helps
Charlie