8400 is definitely better. Although likely more expensive once you factor in the cost of a Z370 mobo. For 60 FPS gaming you'd probably never notice the difference though.
A 1060 is fine for 1080p/60 fps gaming, but if you think you might upgrade monitors and/or would like a bit more longevity from your build, a 1070 wouldn't hurt.