I’ve managed to upgrade an i7 T480 with a new display, glass trackpad, WiFi 6e, 2xNVME SSD and 64GB ram. It has 2 USB-C ports, on of which is thunderbolt. I also have an actual dock for it and batteries for hot-swap.

If they made anything close to the expandability of these, I’d be buying that as well.