So you're keeping the CPU, mobo, RAM, SSD+storage and you're getting a 1080?
Other than the case and watercooling setup, what else is there to upgrade? I suggest sticking a post in the watercooling section and see if the guys there can help you spend your money