To keep from overswinging, practice in front of a full length mirror. Ensure your left heel (for righties) does not come off the ground. This will keep your hips from over rotating, keeping your upperbody from over rotating.