You are hitting from TP tees, your driving average is pretty good. Your GIR and your 21 feet from the hole average is what is killing you.
A driver with a little more distance may set you up for better approaches. A much more longer distance driver, hitting from your tees, may help BUT may also get you in lots of trouble.
In my opinion, the level 58-59 full Ping G20 set is where you should be aiming, which is what I did. As far as right now, I would replace your current driver with a long 3W and use it for both driving and fairway shots. You can then remove your current driver, 3W and hybrid, and add one more wedge.
It is your 2nd-3rd shots that are taking you out of birdie range. Thats where I would be looking to improve.
Cheers.