If you can wait 2 weeks to Ryzen 5, it may give you more wiggle room while offering similar single thread performance while also providing may more threads than the Intel chip
You'll also be able to overclock the CPU if wanted.
If at all possible, I'd wait for Vega (new AMD GPU's) to land...