If you really want to improve your short game get a Z Satin 64° wedge, it's a great club, easier to use then the Cleveland one and about as accurate as you'll ever need. If you want to carry 3 wedges you'll need to drop either your 3 wood or hybrid, personally I'd lose the hybrid, chances are you don't use it often, you'll certainly use a 64° wedge tons more.
Putters are a very personal choice, many players hate the Spider, myself included, but if you like it stick with it. Whatever works for you is good.