First and easiest choice would be upgrading from the 1080 to 2080/s.
I had a 2600 system and a 6700k system a couple of months ago, I'd say in gaming they were fairly similar in performance so if you were going to upgrade cpu + motherboard and move over to ryzen that would be the base line to look above for increase in performance.