Upgrade from gaming laptop to gaming desktop

Looking to upgrade from a gaming laptop to a gaming desktop.

Current specs:

Asus Rog Strix Scar II 704GV
- Intel core i7
- 2.20 GHz (12 CPUs)
- VRAM: 5,98 GB
- NVIDIA GeForce RTX 2060
- storage: 256 SSD (1TB GB HD 2nd disk)
- RAM: 16GB

New specs:

Considering a pre-built system: Lenovo Legion T7 34IMZ5 90Q900BSMH
Cost: 1.999 EUR
- Intel core i9 octa core
- 3,5 GHz
- VRAM: 8GB
- NVIDIA GeForce RTX 3070
- storage: 1TB SSD
- RAM: 32 GB

I'm looking for a decent desktop pc for the following reasons:
- Good VR specs
- Gaming at high resolution
- Connecting 3 monitors (at least one with 4K quality)
- Replaceable parts

Kind of conflicted if I should upgrade now.
- I'm a bit low on storage space on SSD and need to micro-manage a lot.
- Game fps is ok on low/medium, but performance is suffering over the last new releases.
- Can't connect multiple monitors for work.
- VR games (star wars squadrons, half life alyx are unplayable due to stuttering)

I would instant-buy if the difference is noticeable enough and if the above issues are resolved AND if the setup is future proof for at least the next 4-5 years. Else I would probably save some money and buy a higher spec PC in the future.

I'm not a specialist in the matter unfortunately, so would kindly appreciate any advice on the latter.

Thanks in advance! (and excuse me if this is a silly questions for the pro's out there :D)