You still swinging a Tony Pena persimmon? Gotta axe the butter knives and get you some...hybrids. Unless you are like Nick Price who says he hits hybrids too straight I have sonartec hybrids to replace my 2, 3 & 4 irons...makes the bag a bit crowded but I dig them. I think they are far more versatile than people think. I hit my 2 iron hybrid further off the tee than my 2iron.
As for basic motion etc. I do it around the practice chipping green. I don't have the heart to hit basic motion shots 20 feet on a range so I do the chip and pitch deal around the chipping green. On the range I start with acquired motion and move on from there. I cap most sessions off with a half hour on the putting green.
Hogan Blades. Tapered Rifle Project X shafts 2-E, SST pured. And Zodia Wedges, of course with custom grind.