Stick with what you have now... unless you really want to play the waiting game for 'the next best thing', then you'll be waiting forever. There's always something around the corner when it comes to these things.
It's not the actual Ryzen 2, but Ryzen+(like kaby lake was to sky lake):
Ryzen 1200/2200, 1400/2400, 1600/2600, and so on... basically clocked a little higher.
In other words, your 8600k is still better than those, except maybe Ryzen 2700x, in productivity related tasks(8c/16t vs 6c/6t).
Cannon lake, ice lake, prison lake, neutron lake, yadda yadda yadda yadda, whatever it's called, won't be much of an improvement over the previous gen. Intel's been doing a bunch of 'tocks'(refined process), but very little 'ticks'(actual brand...