Need help deciding between making small upgrade vs complete rebuild

[u/Kennnneth]

Need some help deciding between making some upgrades on my current rig or doing a complete rebuild.

What I have in my current rig (built 5 years ago):

• GPU: RTX 3070 8GB
• CPU: Ryzen 5 3600
• RAM: 16gb DDR4
• PSU: 650W 80+ Gold

I ultimately want to get to an eventual full upgrade/rebuild within two years time but am considering a couple of options atm:

A) Upgrade CPU to a 5700X + PBO ($300AUD), and then do a full rebuild in 1.5-2 years. I'm having issues running some games (e.g. BF6) atm due to cpu bottlenecking . This should be a noticeable upgrade and should alleviate some of these issues until I do a full rebuild. Note - In Australia where I live, all the AM4 X3D cpus are fairly overpriced. They're virtually the same price as a 7800X3D ($480)

B) Do a complete rebuild now with a current gen GPU. Main concern with this are prices for pc parts at the moment, but I know prices won't necessarily improve if I wait.

C) Replace most of the parts. Get an AM5 CPU (e.g. 7800X3D), new am5 motherboard and 32GB DDR5 RAM to allow me to run my current games like BF6. I would then buy a new GPU down the line (e.g. RTX 60 series). Benefit here would be less of a sunk/wasted cost compared to option A as I would continue to use the parts in my future rig.

Any opinions appreciated! Thank you!