Alright. Definitely gonna wait for the 3000 series and then think about it. I’m also thinking that when the 3000 series drops, the price for a 2080 Ti will fall, so it could be a good option if the price does fall by quite a lot, if not, then the 3080 would be the clear choice.
As for the CPU, I think you’re right, not worth upgrading to an i9 9900k since my i7 is at 4.8.