Upgrade need advice

[hondo420]

So im going to be building a new system late august currently i have a i7920 bloomfield r9380 gpu 12gb ddr3 850w psu.

So i only use the pc for gaming and some streaming i play diablo 3 players unknown battlegrounds and csgo.

im going to be buying a new video card this week to through into my current system untill i build new one i have been looking at either a 6gb 1060 or a 8gb 1070gtx.

my monitor is 1080p 60hz HP 25es.

if you wanna give advice id appreciate it also still struggling with either ryzen or i7 for cpu,

 

[CorsairSSC]

PCPartPicker part list: https://pcpartpicker.com/list/z4Js4C
Price breakdown by merchant: https://pcpartpicker.com/list/z4Js4C/by_merchant/

CPU: AMD - Ryzen 5 1600 3.2GHz 6-Core Processor ($197.88 @ OutletPC)
CPU Cooler: CRYORIG - H7 49.0 CFM CPU Cooler ($34.89 @ OutletPC)
Motherboard: MSI - B350M GAMING PRO Micro ATX AM4 Motherboard ($69.99 @ Amazon)
Memory: Corsair - Vengeance LPX 16GB (2 x 8GB) DDR4-2400 Memory ($115.88 @ Amazon)
Storage: Western Digital - Blue 250GB M.2-2280 Solid State Drive ($89.99 @ B&H)
Storage: Seagate - Barracuda 2TB 3.5" 7200RPM Internal Hard Drive ($66.89 @ OutletPC)
Video Card: EVGA - GeForce GTX 1070 8GB SC GAMING ACX 3.0 Black Edition Video Card ($444.98 @ Newegg)
Case: Inwin - 301 Black MicroATX Mini Tower Case ($64.99 @ SuperBiiz)
Power Supply: Corsair - CSM 650W 80+ Gold Certified Semi-Modular ATX Power Supply ($59.99 @ Newegg)
Case Fan: Corsair - Air Series SP120 High Performance Edition (2-Pack) 62.7 CFM 120mm Fans ($27.67 @ OutletPC)
Total: $1173.15
Prices include shipping, taxes, and discounts when available
Generated by PCPartPicker 2017-07-29 15:47 EDT-0400

 

[hondo420]

Video Card: EVGA - GeForce GTX 1070 8GB SC GAMING ACX 3.0 Black Edition Video Card ($444.98 @ Newegg) so im gonna be buying the card today or tomorrow ive been waiting an waiting for prices to drop and they seem to be a little ty for the info i almost bought a 1060 6gb for 289$ but passed on it.

 

[hondo420]

So i bought the gigabyte G1 gtx1080 gpu, Thermaltake core p3 case,gskill flare x 3200mhz ddr4 16gb. So question is what ryzen chip what MB what ssd do i need the expensive evo pro 960 or will a cheaper one do just fine? i have been eyeing the swift tech h220x2 water cooler i want to be able to OC whatever chip i get.