Building new computer, keep 4070 or upgrade?

Looking for input on a new pc I am building. Kinda out of the loop at the last time I built a pc was 8(ish) years ago.

Current computer had the video card go about a year ago, went and bought a 4070 super and been using that since. Nothing else has been upgraded.

Currently have this build setup on pc part picker, prices are Canadian and typically buy from memory express and just price match.

https://ca.pcpartpicker.com/list/wd6CHW

I do believe what I have read so far is the 9800X3D might be a bit overkill with my current card and I could maybe upgrade to a 5070.

Once the build is complete I will be playing a lot of battlefield 6, currently play stalker, and borderlands 3 with a goal of maintaining ultra settings at 4k.

I try to future proof as I avoid building anything for 6+ years if I can help it.

So what do you think? Continue with the build using the 4070 super, downgrade CPU, or upgrade gpu?