One thing which would help with coming into the wind and tacking would be adjusting the setting angle of the driver - this should be sheeted home, at the most windward angle possible to drive the stern around with no change of trim needed to keep the stern pushing through the eye and then being trimmed for minimal drag already once on the wind on the opposite tack - currently the sheeted home position is 'on' the centreline.