We have a 93 mark II with tall rig, bow sprit & wing keel. I just launched today to test new rudder and prop we installed. Aside from that I noticed that it still will not track when I turn into the wind to dock. It keeps drifting to leeward towards my neighbors boat. I had to reverse to prevent contact And it would not turn towards my slip going forward. I had to back into my dock to get there. No sails mounted yet, this was under power. I can touch very close to 30 degrees apparent when tacking but when tracking I seem to be drifting off course (GPS) and need to make a lot of course corrections. Are the two related IE a quirk of the wing keel or something else at slow speed because the bow catches the wind. What should I do to control this. This is Lake Erie and we get frequent 10 to20 knot winds from the east to north-east. Thanks for any help, was on the hard 2 years to do repairs.