Depending on the game titles you play I'd suggest the 5800x3d. It really is a great cpu for gaming with the retired AM4 socket. It is on average about $100 more than the 5800x.
Your motherboard would support the 5800x series with a BIOS update. Replacing it would then bring up the question why invest too much in an older platform.
The 3080 is a good gpu but stocks are running low with the pricing cuts. But they are power hogs. If you can't find one the 4070 TI would be a good candidate as well. With either gpu you choose an 850 watt psu would be a good choice.
Like you I'm still gaming with the older 3800x and 2070S at 1440p. It's been a super rig but changing to a 5800x3d and 4070 TI very soon.