Current. Thinking of just new CPU + maybe swapping to 32GB before a GPU upgrade.
for me personally, I would wait it out for another year and see what viable options there are available. while the promise of the 5800X3D is amazing, it is quite dated now considering the new gen Intel/Ryzen are significant improvement over it plus the end of the AM4 support is a limitation and something to think about. if you are only spending $500 on cpu/ram/gpu and would never consider to upgrade for 5 more years (depending on how things would pan out), I guess that would be a good option. your intended upgrade over your current rig would certainly have noticeable great boost but cost-wise and future proofing makes it less ideal setup.
from what I could see, there are certain current parts that would seem to indicate that you needed a better one over the 5800X3D.
Ryzen 5800X3D - pros: huge performance boost over 2600X. cons: last of the AM4 cpu, AM5 Ryzen and i13 chips are noticeably better and price are better and future-proofed.
btw, you needed a better cooler for the 5800X3D as well.
your mobo is good but is limited as well as it's PCI-E doesn't support Gen 4.
32GB ram is good enough for gaming, but found it limited for multi-tasking. I would say 64GB is recommended but I would go for 128GB.
nvme prices are cheap so far, you can upgrade to 2TB and you can get better ones over the current ones you have.
2070 gpu - unless you are still planning to game at 1080P, medium setting for 2-3 more years, this would be fine. if you are upgrading let's say to a RX7900XT or 4070Ti on max setting at 1440p or 4K resolution.
PSU - it would be recommendable to upgrade to 1000w.
with those parts to be considered and situation, it wouldn't make sense to upgrade partially.
my current rig has been running around 5 years now and slowly starting to show it's age. I meant it is still performing well for what I'm using it for and as long as I don't go 4K, it would do well.