I'm more worried about screen issues. I got the premium HDR Dolby Vision screen, and I love the 500 nits & the wide color gamut is stunning & very OLED-like. But the calibration is off, the screen has a red-tint that hurts my eyes and makes the rest of the world look sickly green when I look away from the screen. I fear I'll have to buy an X-Rite and make my own calibration. It isn't like my Dell monitor, which came individually calibrated & with a printout of the calibration.
Also, this X1 Yoga (or Windows?) does lots of dynamic screen dimming, which was messing with Sublime Text in Monokai (dark) theme. It would dim the screen so much that white text would become mid-grey & it was unreadable & low contrast. I was able to turn that setting off, but doing so has reduced battery life to the numbers you see above.
If having a large / replaceable SSD wasn't a priority (and battery was more of a priority), I think I would very seriously consider the Surface Book 2. But hopefully I'll like the X1 Yoga more as I get used to it.
I'd love to hear your thoughts on battery life doing anything useful (not watching movies) with your new one. I'm debating an X1 Carbon, HP Spectre, or XPS 13 to upgrade to in the next few months.