Re: wedge?
BB,
Would consider a 54º and a 58º if you want two, or a 56º if you want just one. Also, try to find clubs that fit into your upper-end yardage gap. Cleveland has lot of CG12 wedges (a couple of years back) on clearance.
If you could find a high-bounce 56º sand wedge - used - this might be a way to start. The 58º or 60º would be a lob wedge, a club that's hard to hit for high-HDCP players. Might wait until following year for this, or maybe try a friends before you buy one.
Also...
Why not create a sig line with a "what's in my bag" listing? That way, other posters can see what you carry in your club mix, how you approach the game. This makes it easier for us to make comments tailored for you.