You may want to wait a couple of weeks to see what the new i5 8600k will bring to the market. Intel has a better IPC and better single threaded performance than AMD chips. While AMD crushes Intel in multithreaded workloads. The new i5 will be 6 core with no hyperthreading, so it will have fewer threads than the 1600. But most games don't scale to thread count. Games like really fast single threaded performance and this is why Intel CPUs get better fps than AMD.
AMD chips have a wonderful value. Just because Intel has better fps in games, does not mean that the Ryzen chips are bad. They are very good and they are priced much cheaper than Intel. If you perform any workstation type task, then AMD is the way to go.
If I were building a machine today, it would be hard to pass on the 1600. But the new i5s may change that.