Can you give us a list of games you play? What settings do you currently play and would like to play at (resolution as well, please)?
I would lean against digging yourself deeper into the AM3+ hole. I went from an FX 4300 to 8320, not the best choice. If I played more AAA games I would have bought an i5 already. Because I play games like WoW, LoL and Osu I don't feel the need to upgrade quite yet. My CPU does cap out quite easily in WoW though, and it makes my eyes rain.
The main issue with AMD is low single core performance. When I built my computer I was just learning so I was like OMG 8 CORES I'M GONNA HAEV THE BEST COMPUTER. That was not the case. My buddy's i5 2500k (stock clock) out performs me in single threaded and multi threaded applications (tested using Cinebench 15 and a handful of games).
My recommendations: Depending on your budget, I would hit up Kijiji, Craig's List, Ebay, etc. and look for a used computer for sale. If there's a decent whole computer at a good price I would grab it. If not, look for parts. You could find an R9 380, GTx 660, 760, etc. for a good price. Also, any i5/i7 from Sandy Bridge (2000 series) and newer would benefit you greatly, making sure you get the correct RAM and Mobo for the CPU. Xeons are your next option. I don't have a list in front of me so if someone could chime in with equally tiered Xeon CPUs that would be great. Don't forget to make sure your PSU is of good quality and has sufficient output. A part list of your current PC would be great, so we know what parts we have to work with to cobble together a PC for the lowest amount possible without losing quality.