Basic Motion alone, in my opinion, will teach you how to deliver the power package through the ball on the intended line. It is a godsend.
After you have become very comfortable with basic motion you can move onto Acquired Motion. I firmly believe you will begin to understand the proper alignments to deliver the power package in such away as to not do that OTT maneuver.
I hope you are right. It would certainly have been easier if I started with golf now, but I have 21 years of OTT demons to overcome...