Your attachment didn't show so can't see what components you picked out.
Is this going to be your main do everything system? It sounds like you have other systems so is this one for a specific task?
As others are going to suggest, Coffee Lake comes out this week and will likely have quite a good performance improvement over R7's. At higher res or hz though your more GPU bound than CPU especially with a 1060. The extra cores and speed Coffee is getting though is going to likely push it past or on par with R7 in the multi-threaded app performance also. I still love my 1700, the system runs as flawless as the best Intel's systems I've had in the past which has not always been the case with my previous AMD systems. So I don't know if you just want a AMD system but this thread has completely changed goals if your not going TR.