3-wood, 4-wood or hybrid
TheSandTrap.com Top Picks
You might try a 4W. You hit your driver far enough you could use the 4W as a single fairway wood. Could also use it out of light rough. It would have more length AND more loft than a 2i, or 3i, giving your some flexibility.
And since you have a Tour Edge driver, see if you can pick up a TE Exotic 4W. People who carry Exotics FWs hint they are nearly magic clubs.
If you had a 4W in your bag (in place of the unnamed FW you list), that would be 14 clubs exactly. You could keep your 2i.
Some people also have a hybrid on hand, and use it during the summer instead of a 2i. They use the 2i in spring and fall when the wind is higher, and the turf is not as plush.