If money is not a issue get a new rig..
PCPartPicker part list:
https://pcpartpicker.com/list/PTxX9W
Price breakdown by merchant: https://pcpartpicker.com/list/PTxX9W/by_merchant/
CPU: Intel - Core i7-8700K 3.7GHz 6-Core Processor ($379.00 @ Amazon)
CPU Cooler: NZXT - Kraken X62 Rev 2 98.2 CFM Liquid CPU Cooler ($147.49 @ SuperBiiz)
Motherboard: ASRock - Z370 Taichi ATX LGA1151 Motherboard ($211.98 @ Newegg)
Memory: G.Skill - Ripjaws V Series 32GB (2 x 16GB) DDR4-3200 Memory ($399.89 @ OutletPC)
Storage: Samsung - 850 EVO-Series 1TB 2.5" Solid State Drive ($299.99 @ B&H)
Storage: Seagate - Barracuda 2TB 3.5" 7200RPM Internal Hard Drive ($59.99 @ Amazon)
Case: NZXT - S340 (Black) ATX Mid Tower Case ($49.99 @ Newegg)
Power Supply: SeaSonic - 750W 80+ Gold Certified Fully-Modular ATX Power Supply ($117.71 @ Newegg)
Total: $1666.04
Prices include shipping, taxes, and discounts when available
Generated by PCPartPicker 2018-01-19 02:01 EST-0500
But I would leave out the GPU for now, even if you dont care, paying 1K for a 1080 is just a rip off.. just wait for the prices to come down.