If I were you, I'd wait untill you see proper Ryzen benchmarks and get a 6c/12 thread (when they are released) ryzen cpu if the performance is good (that is R5 1600X or R5 1500).Those are supposed to come out in Q2 2017 I think the slightly higher price (30-50$ extra) is worth the performance you will get compared with any i5 on the market.
P.S. You can also try to stretch the budget for a R7 ryzen cpu or a Skylake or Kaby Lake i7 (Intel anounced the price for those i7's will be reduced):
http://www.game-debate.com/news/22385/intel-slashes-prices-of-core-cpus-by-up-to-300-in-response-to-amd-ryzen
Imo the i7 6700k is a good buy at 259$.