007 - For the short term, I wouldn’t do much of anything except practice what you’ve got.

For the long term, it’s simple. Fix the major swing faults that are impeding your progress. Good swing fundamentals are just that because they enhance accuracy as well as speed and efficiency. Do you need a swing exactly like Luke Donald, or Charles Howell, or Tiger down to the last nut?. Is there only one way to swing a club consistently? No, but there are some ABSOLUTE fundamentals that are required to confidently shoot consistently below scratch. But then it sounds like you already know this.
I would suggest getting professional help. Not some "Tin Cup" driving range instruction, but a real teacher, PGA or otherwise. You will likely not find such a teacher on the first try. If you insist on working alone, then I suggest that you need a HUGE education in the golf swing and you COULD spend several years sorting through the myriad of differing philosophies and instruction, chasing endless dead ends, before you LEARN enough to be able to effectively "teach" yourself at the level you’re talking about. JMO.

You can keep trying to pound a square peg into a round hole by working on accurate contact of the hammer and the peg, or you can work on finding a round peg.