> My current setup is a laptop with Windows 10 as a host and an Ubuntu VM for work

You seem like the perfect target for a Linux based laptop.

Buy an SSD and install Ubuntu on your current laptop to see if it has any problems?

Otherwise I bought an XPS (despite my long term hatred of Dell hardware) and they have good Linux support.

Installing Windows in a VM is way easier, and you can control updates better in some fairly dirty ways (snapshots, firewall etc).