Given you level there are lots of options, and what ever choice you make there will be an adjustment period from your current clubs. I would recommend that you set up some practice rounds on low wind, and chart your new distances etc, i.e. 3I with not spin, then with full back spin etc. This will help you game immensely.
There are 2 obvious options for you, either the G20's or the R11's sets, G20s are cheaper and have a slower meter than the R11's. I know plenty of players who use the G20's even after making Legend, though majority of Legends play the R11's for there superior stopping power on approach shots.
Buy either as a set, will be cheaper than buying each item individually, plus you can then sell back the hybrid.
In terms of wedges, would suggest three, plenty of options here, but look to keep all your meter speeds as close as possible. also price is a big factor here, big difference between the Ping tour 20's and the ATV's, basically 5 times dearer.
In terms of putters, i see you have bought one, if you are happy with it don't change, if you aren't consider meter speed, and whether you are a ding or miss ding putter, some are better suited than others. If you search in equipment thread, lots of posts round putters.
cheers