Just thinking out loud, wouldn't heading up in a puff be 'faster' in the upwind leg, as in each puff you are gaining some height?