a) Never unclip, if the ski drifts away, you will have to swim ashore!
b) turning the ski to face the wind helps
c) start paddling immediately to gain stability.
d) check out my rig - I saw this basic setup on a kayak of a Norwegian friend and through trial and error refined it for surfskis













the idea with my rig is a) that I can immediately make the ski to face upwind by tugging on the paddle leash, and b) I can always get to the upwind side easily
The trick on the rig is that the rope extension on the paddle leash is attached to the tightly tied line which runs from the bow to the cockpit with a bowline, which means that it runs freely fore and aft. When in the water, let the ski drift a bit, tug the line, the ski faces upwind immediately, the lines are untangled, all you have to do is swim to the upwind side of the cocpit paddle in the upwind hand, enter the ski - I very much prefer side entry, then paddle like crazy to gain speed and stability - dont worry about getting feet in the straps, you can do that afterwards
AND YES PRACTICE, PRACTICE, PRACTICE!!!
It took me days of constant dumps and remounts to be able to remount in high wave conditions!

notice, as soon as you enter the boat:
a) start paddling to gain stability
b) lean back a little bit until you get speed
c) enter with paddle in upwind hand towards bow
d) put legs in straps gradually
e) practice a lot to get the desired fluid motion
f) when reentering dont jump on the boat, tilt it towards you and roll onto the deck, pushing with both hands.