If your doing more than just gaming I would do with Ryzen, I believe it will support future 7nm CPUs where intel probably you will need to change mobo again to support a next gen cpu upgrade.
Besides, Ryzen is really good CPU.
PCPartPicker part list:
https://pcpartpicker.com/list/G894yf
Price breakdown by merchant: https://pcpartpicker.com/list/G894yf/by_merchant/
CPU: AMD - Ryzen 7 1700X 3.4GHz 8-Core Processor ($399.89 @ OutletPC)
CPU Cooler: CRYORIG - H7 49.0 CFM CPU Cooler ($28.90 @ Newegg Marketplace)
Motherboard: ASRock - X370 KILLER SLI/ac ATX AM4 Motherboard ($123.98 @ Newegg)
Memory: G.Skill - Ripjaws V Series 16GB (2 x 8GB) DDR4-2666 Memory ($174.95 @ Amazon)
Storage: Samsung - 850 EVO-Series 500GB 2.5" Solid State Drive ($149.99 @ B&H)
Storage: Seagate - Barracuda 2TB 3.5" 7200RPM Internal Hard Drive ($66.88 @ OutletPC)
Video Card: Asus - GeForce GTX 1080 8GB TURBO Video Card ($499.99 @ Amazon)
Case: NZXT - S340 (White) ATX Mid Tower Case ($64.99 @ SuperBiiz)
Power Supply: EVGA - SuperNOVA G3 550W 80+ Gold Certified Fully-Modular ATX Power Supply ($58.98 @ Newegg)
Total: $1568.55
Prices include shipping, taxes, and discounts when available
Generated by PCPartPicker 2017-11-20 05:04 EST-0500