I'm needing to upgrade to Win11 (Autodesk Fusion Win10 support ends soon), but since getting a new laptop (Ryzen 9955HX3D/5070Ti/32GB), the desktop is feeling a bit slow, and I'm stuck procrastinating over what to do 
I have done the whole using the laptop with external monitors/keyboard/mouse in the past, but I much prefer a separate desktop.
Spec for the current desktop is -
Asus ROG Strix X570-F Gaming (AMD AM4) DDR4 X570 Chipset
AMD Ryzen 5 3600 Six Core 4.2GHz (Socket AM4) Processor -
Asus GeForce GTX 1660 SUPER Phoenix OC 6144MB GDDR6
Team Group 8Pack Edition 32GB (2x16GB) DDR4 PC4-28800C16 3600MHz Dual Channel Kit
Seagate Barracuda 510 1TB PCIe NVMe M.2 Solid State Drive
Seasonic Focus GX-750 750W 80+ Gold Modular Power Supply
I have considered putting a new processor in (probably a 5900X since it's still available to pre-order, whilst the 5950X is now out of stock with no pre-order), along with a new graphics card, however the 5900X still isn't as powerful as the laptop, so I feel a processor upgrade probably isn't value for money.
However the cost of a new mobo, processor, and 32GB of memory is pushing the budget somewhat, even before I consider adding a new graphics card to the mix.
So I'm considering a new graphics card (probably something like a 5060/Ti), along with a new NVMe drive with a fresh install of Win 11, or should I just bite the bullet and go AM5?
Anybody care to suggest what direction I should procrastinate more in?

I have done the whole using the laptop with external monitors/keyboard/mouse in the past, but I much prefer a separate desktop.
Spec for the current desktop is -
Asus ROG Strix X570-F Gaming (AMD AM4) DDR4 X570 Chipset
AMD Ryzen 5 3600 Six Core 4.2GHz (Socket AM4) Processor -
Asus GeForce GTX 1660 SUPER Phoenix OC 6144MB GDDR6
Team Group 8Pack Edition 32GB (2x16GB) DDR4 PC4-28800C16 3600MHz Dual Channel Kit
Seagate Barracuda 510 1TB PCIe NVMe M.2 Solid State Drive
Seasonic Focus GX-750 750W 80+ Gold Modular Power Supply
I have considered putting a new processor in (probably a 5900X since it's still available to pre-order, whilst the 5950X is now out of stock with no pre-order), along with a new graphics card, however the 5900X still isn't as powerful as the laptop, so I feel a processor upgrade probably isn't value for money.
However the cost of a new mobo, processor, and 32GB of memory is pushing the budget somewhat, even before I consider adding a new graphics card to the mix.
So I'm considering a new graphics card (probably something like a 5060/Ti), along with a new NVMe drive with a fresh install of Win 11, or should I just bite the bullet and go AM5?
Anybody care to suggest what direction I should procrastinate more in?