Out of the tech loop, considering upgrading

With BF6 looking enticing and GTA6 around the corner, I think I'm about ready for a PC upgrade, but having been out of the loop on new releases for the past 4-5 years, I'm seeking advice.

I'm located in Denmark and budget wise I'm flexible

I'm currently running on the following system: RTX 2070 Ryzen 7 3800x B550-F 32GB DDR4-3200 1080p 144hz monitor

It's served me well and still does somewhat okay in performance, I'm just getting tired of running everything on low in modern games to achieve decent FPS.

Based on my own research the last week or so, I'm contemplating something along this setup: RTX 5070 Ti Ryzen 7 9800X3D B650-PLUS 32GB DDR5-7600 1440p 144+hz monitor

Alongside other smaller stuff like a new PSU, bigger SSDs etc - essentially an entirely new rig at the end of it.

I'm open to feedback on what changes or considerations any of you would have, my primary goal is to have a solid and relatively future proof system that will be able to run without issues.

Especially curious on the choice of waiting for AM6, which sounds like it might launch Q1/Q2 of 2026? I'm sure my current 3800x could run BF6 at launch at admirable performance with an upgraded GPU alongside it, so I could hold out for AM6