I would suggest you buy a Ryzen 5 1600 or wait for the i5 8400 to be in stock. I would NOT suggest you buy any FX CPU because they are a dead platform and several years old, and you should also avoid the i5 7500 because you cannot upgrade to any newer Intel CPUs. As for your GPU, it depends what resolution and framerate you game at. At 1080p 60fps the 1060 6GB is perfect, at 1080p 120-144fps the 1070 will be a justified upgrade, 1440p or higher at any framerate the 1070 will be necessary