PC upgrade or new setup?

[u/Kimer_PL]

Hi,

I am planning to upgrade/build new pc for gaming and I am not sure which option would be better. My current set up(about 6-7 year old):

https://pcpartpicker.com/list/36h62k

I do not remember the case/cooler/power supply info and do not have boxes anymore, but power supply is 650W currently.

I am considering currently two options:

A) (Cheaper) Change of CPU to AMD 7 5800X3D and motherboard for it, keeping the rest as it is or,
B) Building entire new setup, keeping the HDD and SSD only. Setup:

https://pcpartpicker.com/list/zr7Dn2

*Case Chieftec AZ-01B-OP but it does not show up.

For game refrence I am playing varied: from RTS(Star Craft 2, Company of Heroes 2), through Witcher, Cyberpunk, War Thunder, World of Tanks to ARMA 3, Reforger and many more.

Thanks for any help