If I may suggest two things that might help with the kayak:
1) Load the kayak evenly...Not front heavy, not center or back heavy. Evenly loaded/balanced. For example, if a kayak is light in the bow and you are paddling into the wind, or have a cross wind, the bow will constantly blow the bow down and off course...A real pain. Also, depending on the kayak, make sure there is weight in the center, otherwise the (some) kayak(s) will bulge up in the center making it a pig to track straight.
2) If kayaks are tipped slightly side-to-side, they will turn...To the opposite side to which they are tipped. You can steer a kayak this way without even having a paddle in the water. Slightly tipping a kayak to one side can help with tracking an errant kayak, but it always better to be balanced.
This applies to canoes, also. If a single paddler, sit in the center of the canoe, not in the back...I've rescued many a canoeist who sat in the back, started out paddling down wind 'cause it was easy, and then couldn't get back because the bow blew down whenever they tried to turn back up wind.
Signed, Chief Tippakanoo