Future-proof gaming build - anything you’d change before I buy?

Looking for some advice before I pull the trigger.
I’m upgrading from a system I’ve been using since 2018:
Intel Core i5-8600
RTX 2080
16GB DDR4

This is the build I’m currently considering
CPU
AMD Ryzen 7 9800X3D
CPU Cooler
360mm ARGB AIO Liquid Cooler
Graphics Card
NVIDIA GeForce RTX 5080 16GB
Memory
32GB DDR5-6000 CL30 (upgraded)
Motherboard
B850 WiFi (brand varies)
Storage
1TB NVMe M.2 SSD could upgrade to 2TBs for $150
Power Supply
1000W 80+ Gold ATX 3.1 (upgraded)
Case
Lian Li O11 Vision Compact
Operating System
Windows 11 Home
Warranty
2-Year Parts & Labor Warranty
Price
$2,717

My main goal is future-proofing. I usually keep my PCs for 6–8 years, so I’m okay spending a little more now if it makes sense down the road.
I’m also planning to pair it with an ASUS ROG Strix XG27UCDMG (27” 4K 240Hz OLED).

I could stretch my budget a bit if there’s a worthwhile upgrade, whether that’s on the PC itself or the monitor.

A few questions:
Would you change anything about this build?
Is there anywhere I’m overspending or underspending?
Would you stick with a B850 board or move to X870?
Is the XG27UCDMG the right monitor for this setup, or would you spend more for something else?