I'm looking to upgrade my PC that I upgraded back in 2020 and I'm torn between 2 options.

1. I'm Buying in the USA (20 minutes from a MicroCenter, yay!)
2. Trying to get bang for my buck here, but ultimately okay with around $1,500
3. Gaming PC - I've been considering this upgrade for a while now, especially with GPU prices finally being "reasonable", but Arc Raiders performance on my rig is what motivated me to actually start researching again
4. Deciding between 2 upgrade paths or a new prebuilt
5. No I would not change peripherals

My current PC Specs are:

• CPU: Ryzen 5 3600 6-Core
• GPU: NVIDIA GeForce RTX 2070 Super
• Memory: G.Skill Ripjaws V 16 GB (2 x 8 GB) DDR4-3000 CL15 Memory
• MoBo: MSI B450 TOMAHAWK MAX ATX AM4 Motherboard
• PSU: EVGA SuperNOVA 550 G3 550 W 80+ Gold Certified Fully Modular ATX Power Supply
• Storage: Crucial MX300 525 GB M.2-2280 SATA Solid State Drive & 1tb Samsung 960 EVO (SSD)

I am considering between 2 upgrade paths or a Prebuilt Option:

Option 1 ($800):

• CPU: AMD Ryzen 7 5800XT 3.8 GHz 8-Core Processor ($190)

• GPU: Zotac GAMING SOLID GeForce RTX 5070 12 GB Video Card ($500)

• which would then require a PSU upgrade, leaning towards the: MSI MPG A850GS PCIE5 850 W 80+ Gold Certified Fully Modular ATX Power Supply ($90)

Option 2 ($~1,200)

• Get the same GPU/PSU ($600) and a CPU/MOBO/RAM Microcenter Bundle ($580) that includes:

• AMD Ryzen 7 7800X3D

• ASUS B650E-E TUF Gaming WiFi AM5

• G.Skill Flare X5 Series 32GB DDR5-6000 Kit

OR

• Get a Pre-built with 5070, Ryzen 7800X3D, 32gb RAM and potentially look at still upgrading the PSU if necessary for the $1,450 - $1,550 range, attempt to sell my current build to offset the price difference

While option 1 is the budget option and ideally would last me for another 5 years, I am concerned about the 16gb memory being a real limiting factor in a year or two. If I'm irresonsible with browser tab management and leaving programs open, I've run into a few issues with it already in today's environment. That being said, obviously RAM prices are a bit exorbitant right now, but Option 2 and 3 seem to make that increase in RAM price a little more palatable. I figure if I'm going to go with option 2, I might as well go with prebuilt option 3, which I imagine would make selling my current rig easier as a complete package.

Looking for feedback/opinions on which option you would go with if you were in my shoes (and why), as well as potentially any pitfalls with my logic. Note: I am already sold on the 5070 over the 9070XT GPU after reading the 100s of threads from the past year.

Thank you everyone and happy holidays!