I'd suggest holding off for a few weeks (if you can) to see how AMD's new Ryzen shapes up. The press embargo lifts today, so there should be a flood of reviews, benchmarks, and general info. Everything I have seen pre-release suggests that they may finally be back in the game. Even if you don't want to go that route, their pricing is going to force Intel to make price cuts on their CPUs, so again it is worth waiting a bit to see how things shake out.