I had a simular issue and I cured it with what I thought at the time was a radical solution. I stopped trying to hit fairway woods and long
irons. I always grabbed my trusty 8 iron, even on par 5's. What I found was that I could usually hit a very solid long drive and always hit my 8 iron straight, follow it up with another 8 iron or less to the green.
The old way, had me hitting a great drive, followed up with a long iron or fairway wood that could end up in bunkers, trees, water, you name it I was there. The new way took some getting used to for me, because I have always played with a "tin-cup" mentality. 240 out--3 wood I can get there... Once I started playing like some of the old timers on the course I saw my handicap drop very quickly. I still have to fight the urge to grip it and rip it even on the tee box, but even more on my second shot. I reckon it has to do with high of hitting a great drive and not thinking through the risk and rewards of my skill level on the next shot.
I find it interesting how much more target focused I am with a short iron rather than a 3 wood. Generally I can hit a 3 wood or a long iron rather well, but I tended to hit into greens that I had no idea what the risks and rewards were and the hit was a "get it up there close" type of effort...
