I think I would work on half swinging for a while at the range, dont know if you saw Padraig on sky yesterday (Sat 2nd) but he puts a glove under each armpit to try and keep everything in check. Our range has mirrors at the back of the bays so what I do is get into the correct position at the top of my backswing, hold it there, check it in the mirror to make sure Im on the correct plane etc and havent over swung and then hit the ball, concentrating on shifting my hips out of the way, keeping my right elbow tucked in and keeping a good tempo, Im not really concerned with distance but I pick out a target and use that as a pin.
Out of interest where do you play? I've played Cleveland and Seaton Carew, 2 lovely links courses. Hope this helps.