You didn't mention if you were having problems with your driver, but depending on the courses you play the driver can be an important weapon and at 460cc they are easier than ever to hit. As far as the long irons, I went one step further and replaced all of my long and mid irons (2 - 6) with hybrids and my game has improved because of it. I gave up my 4 and 7 wood, finding the hybrids much more consistent for my swing. I don't know your age but I am 62 and in the last few years my iron yardage dropped dramatically and I gave up the 2 and 3i a long time ago.
You have a much lower HCP than I do and I obviously do not know why you are not hitting certain clubs, but you should have the talent (with a lesson) to get the driver going - I love the 2h and use it to drive shorter holes, but it is not close to my Ping G15 driver in distance.
I hope you work it out and have fun doing so.