Would probably be best if you go with Ryzen... better CPU for productivity as it has more cores.
PCPartPicker part list:
https://pcpartpicker.com/list/FWtZCy
Price breakdown by merchant: https://pcpartpicker.com/list/FWtZCy/by_merchant/
CPU: AMD - Ryzen 7 1700X 3.4GHz 8-Core Processor ($349.99 @ Amazon)
Motherboard: ASRock - X370 KILLER SLI/ac ATX AM4 Motherboard ($138.98 @ Newegg)
Memory: GeIL - EVO POTENZA 16GB (2 x 8GB) DDR4-2133 Memory ($102.99 @ Newegg)
Storage: Samsung - 960 EVO 250GB M.2-2280 Solid State Drive ($127.99 @ B&H)
Storage: Seagate - Barracuda 2TB 3.5" 7200RPM Internal Hard Drive ($69.89 @ OutletPC)
Video Card: EVGA - GeForce GTX 1080 8GB Superclocked Gaming ACX 3.0 Video Card ($498.99 @ SuperBiiz)
Case: NZXT - S340 (Black/Red) ATX Mid Tower Case ($68.89 @ B&H)
Power Supply: EVGA - SuperNOVA P2 650W 80+ Platinum Certified Fully-Modular ATX Power Supply ($99.99 @ Jet)
Total: $1457.71
Prices include shipping, taxes, and discounts when available
Generated by PCPartPicker 2017-05-25 18:16 EDT-0400