Build a PC Input on New Build Plan

It's been some years (2013) since my last PC was built, and quite a lot has changed since then that I've had a stab at learning, and put together a few components that I hope will serve me well for a few years to come. Would love some feedback on peoples thoughts.

FTR I plan to game on my 1440p monitor, with some (hopefully) decent framerates, I am finding a few new games arent hitting 60fps at this resolution unless I make great sacrifices in the graphics. I do a little video editing, but encoding times are not much of an issue to me, the stuff I do is not time important so.

I plan to keep certain parts of the current build, ie

Corsair Obsidian 750D Case /w 4x 120mm fans
Nvidia 1070 GTX GPU (Will probably upgrade when 3000 series Nvidias come out)
Corsair 860i 860w Modular PSU
Samsung EVO 840 SSD 1TB
Seagate HDD 3TB

And the new parts...

ASUS TUF GAMING X570-PLUS (WI-FI) Mobo

AMD Ryzen™ 7 3800X, AM4, Zen 2, 8 Core, 16 Thread, 3.9GHz, 4.5GHz Turbo, 32MB L3, PCIe 4.0, 105W, CPU, +Wraith Prism fan

1TB PNY XLR8 CS3030, M.2 (2280) PCIe 3.0 (x4) NVMe SSD, 3D TLC NAND, 3500MB/s Read, 3000MB/s Write, 677K/735K IOPS

16GB (2x8GB) Corsair DDR4 Vengeance LPX Black, PC4-25600 (3200), Non-ECC Unbuffered, CAS 16-18-18-36, XMP 2.0, 1.35V

I see NVMe drives are about as fast as you cna get atm on PC so plan to have OS installed on that, plus having plenty of space for video files I work on, the SSD I currently have for most games and the large HDD for basic storage.

I do realise nothing is top end, but what is peoples thoughts re a PC that will run for the next 5 or 6 years, or maybe get lucky like I did with my last build and get even longer?