4-wood or 17º hybrid
TheSandTrap.com Top Picks
If you only hit the wood 5 yards farther, then dump it. I use the same hybrid and it flies about as far as I ever need it to with a strong 3 or 15˚ hybrid backing it up. I basically use the hybrid off the deck to attack par 5s and off the tee to give me position and height. Sometimes it's the only wood I carry besides my driver or even at all.
As far as the 2 iron, I have one but don't like it that much. It's really not that necessary to carry the 2 even in winds and courses with tight fairways, and the 3 can do most of what I require more consistently. I can be more aggressive with the hybrid distance wise and the iron is a lot less forgiving, really only good when I'm having a great ballstriking day when I'm unlikely to need help finding fairways. Then there's the whole matter of launching it from the deck without thinning it, which the hybrid performs brilliantly and the iron horrendously. It works for some people but there are too many drawbacks to give it a permanent spot in my bag at least. Give it some time with the hybrid and I expect you may find it to be very versatile.
I'd also check that you're doing keys #2 and #3 well, since funky yardages and trajectories in the long game can be an issue of dynamic loft and AOA being out of whack. You can get away with both on tee shots and with more lofted clubs a bit, or compensate with your setup, but the long clubs off the ground are demanding.