One trick whenever you might have to leave sails up is to completely release the downhaul (and make sure there is no tension remaining). I also recommend this in between races out on the water if "parking" head to wind- the rig will calm right down rather than trying to constantly fill on one side or the other.

Kirt