Just switched to a Thinkpad P1 Gen 2 which is almost the same machine as a X1 Extreme Gen 2. You can get upto 64 GB of user-upgradeable RAM and 2 replaceable SSDs in a package approx the same weight but 1-2 mm thicker than a 15 inch Macbook Pro. It may not fit the current fashion but to me it's a really aesthetically attractive package.
Windows 10 Pro with WSL is MUCH better than I expected it to be. Download Conemu, Terminus or similar as a terminal and you may as well be running Linux. Download VxXsrcv and you can even run the Linux version of your IDE. I run the Linux versions Emacs, IntelliJ and Pycharm, not the Windows versions.
Hardware wise, the Trackpad is worse but I don't really miss it. Keyboard is much better. Lots of ports. Great screen, though most of my time is spent connected to an external monitor, keyboard and mouse. Multi-monitor support is good. Only annoyance is that if the screens sleep all your applications get moved to whatever monitor you set as primary but this is a minor annoyance.
Ubuntu runs great but since I can ssh to multiple machines running Linux already, and I can run WSL, I really don't feel the need for Linux on the machine itself.
Less thermal throttling. Battery life is decent. I get a real 8 hours in battery save mode even with IntelliJ or Pycharm running, so long as I've set things up in the IDE to save battery by not continuously re-indexing things. Most Thinkpads are rated Milspec 1 so the keyboard isn't going to die with the first spec of dust and the machine will survive minor mistreatment. Windows with WSL basically gives me everything I need.
I bought a Macbook the week Apple released OSX and have been an Apple fanboy for years but at this point for what I do, as someone doing a fair bit of programming, it's an inferior machine.
I've also tried the various Dell XPS machines. They frankly aren't really comparable to Thinkpads in how well they are built or fit and finish. The XPS 15 is a direct competitor to the P1 Gen2 (or X1 Extreme) and in my opinion if you use both for a week, there is no comparison. I have friends who have also switched to Thinkpads and/or Dell XPS machines so I was able to compare directly before I bought them.