There is going to be a degree of the crew having to bring the kite in as the boat accelerates out of the gybe. The trick is doing it AS the boat accelerates. The better the two of you get at gybes, the faster you can turn, then the less the boat decelerates and the less the spinnaker trim will change during the maneuver. Until then, soft set early, trim quickly with acceleration.