Spending $2000 on new parts/semi new build.

[mpperrusquia]

My current machine is currently running an i7 4770k @3.8ghz, Asus Z87 pro mobo, GTX 1080 Founder's Edition, 32GB DDR3, corsair 650 watt 80+ Gold power supply, Crucial 240GB SSD, WD 1TB Black HDD, with air cooling, no watercooling. In a Coolermaster Haf XB Lan box. I'm basically just keeping the GPU, and doing a new build based around it. Does anyone have a list of suggestions? Any watercooling suggestions? I'm not too strict on the budget, but I'd prefer to keep it near $2000. Should I also be looking at the 6800k, or trying to wait a couple of months for the 7700k? If it helps the monitor I'm driving is the Predator X34. Any suggestions for parts would be appreciated. This will be my second build.

 

[WiiUMasterGman]

http://pcpartpicker.com/list/n9fMpb

I know I went overkill on the PSU but I'm giving you the option to go SLI if you wanted too. If you aren't OCing and not video editing there really isn't any need for the i7 6800K. If you are just playing games all you need is the i5 6600/6500/6400.