We have had the same experience with our Infusion. Once it comes up it want to sail off despite best efforts to right into the wind. cracking the mainsheet off might be a solution that we have not tried yet, at least not to an extreme. We usually crack it off a few feet in the block to block distance. As Bo spoke of earlier we have found that having the crew sit on the bottom hull as it comes up puts him on the deck as the boat is righted. He then steers into the wind I come onboard between the tiller tie bar and the rear cross bar. It seams to be working pretty good but he does have to move mast to get to the tiller.