Put your feet together and hit balls off a tee to eliminate sway in your swing
Working on your swing in slow motion will allow you to analyze what you are doing on each part of the swing, which will help you fix your flaws but also get away from swinging segmentally
Get good at the standard pitch shot before you start getting complicated with your pitches, get your feet close together, clubface slightly open going back, turn your body with the downswing and resist right after impact to create spin