If the jib not sheeting out enough is part of the problem, would it help to disconnect from the clew?
My experience with the drift sock off the bow, ala Jake's set up, is that it does an excellent job of orienting the bows into the wind for righting, prevents drifting into possible hazards, and operates as a great brake if the boat starts to sail off.