I'm unsure though whether it is worth it to wait for AMD's 6000 Models? Since I'd like to have PCIe Gen 4 in the upgraded system I opted for an 5800X as a potential new CPU. I'm currently looking into upgrading my i7-6700k in my desktop. I currently have 32GB DDR4 and a GTX 980. Other details (existing parts lists, whether any peripherals are needed, what you're upgrading from, when you're going to buy, what resolution and refresh rate you want to play at, etc):

Games, programs or workloads that it will be used for: Budget (including currency): ~1000€, but flexible there