If you aren't in a hurry to upgrade, you could wait for Kaby Lake and Zen. If Zen fails to put some pricing pressure on Intel, at least you'll have much improved options to consider on AMD's side. At the moment, AMD's CPUs are pretty much out of the performance game.