Personally I would get the 1080 and see how it does. Most games don't take advantage of higher than 4 cores with 8 threads anyways at the moment so you could get away with sticking with the 1500x. AMD is going to be dropping their new 12nm revision of ryzen sometime in the first few months of 2018 anyways so I'd hold off until then to upgrade the cpu.