Just to play devil's advocate here, but since the 2600X isn't out yet, so how do we know it is 10% slower and cooler with less power?
AT this point, Ryzen gen 2 is a bunch of "what ifs" and "maybes".
I am just taking R5 1600X as higher clocked. .
OP is using 60Hz, maybe he should switch to 144Hz (that was game changer for me).
1. R5 1600X MT = i7 8700 MT clock per clock .. Ryzen 2 will push clocks a bit higher. (unless you gonna use AVX512)
2. I5 8400 has around same multithread performance as R5 1500X and i7 7700K.
Anyway, game are moving forward to more realistic physics and so on... games will like those threads.
I bought R7 1700 and C6H ( Yes I am fan of AMD, yet I switched to Intel after FX disaster) . If I had to choose again, I would probably wait to see how well does pinnacle ridge and then choose between i7 8700/K and R7 2700X. If I would be in a hurry I would choose i7 8700/K, but since he is using 60Hz maybe I would go for a deal with R5 1600 and 144Hz monitor. If his budget isn't big deal then i7 8700 + 144Hz monitor would do great. With decent 3200MHz DRAM he will enjoy every second.
A year ago everyone was saying that buying i5 7600K and overclocking it to 5GHz is better than ryzen at 3,8GHz... but now those guys are recommending i5 8400 3,8GHz.