Gybing is now easy(ish) on flat water for me, but out in the waves 2-4 ft I find myself often getting bumped off balance by the swell before I finish the turn. Any tips? Just gybe faster?

More speed, tighter radius.

use the waves for glide. Take your time.

Can be easier to breach a tip and ventilate or throw off balance in waves vs flat, so try not to heel over as much.

I like to try and time my jibes so that I'm mimicking a top turn on an approaching swell so that most of the time I can go straight into flagging the wing and take my time to switch hands.

My other tactic is to build speed, release the wing early and focus on a consistent carve to my new heading.