Question PC Upgrade and AIO solutions

[eco_bach]

Hi
My custom built PC is beginning to show its age.
These are my specs
Mobo ROG Zenith Extreme

AMD ThreadRipper 1950x 16-core 3.7 GHz

RAM 64 GB

GPU Nvidia PNY A5000 24GB VRAM

WC SwifTech H240

Case Phanteks Enthoo Luxe

2 questions
1- Given the above (and a budget of under $2000), what would you upgrade?
2- Are there any AIO units that are highly recommended? (ie great value in terms of price vs performance)
I am considering just keeping my current setup as a backup.

Any feedback appreciated!

 

[PcIneedSomeHelpHere]

How long have you had this for?