T480s or X1 Extreme G2

If you had both and have to sell one, which one would you keep?

T480s is i5 8250u, 16gb, and the screen was replaced with a Innolux 400 nits 98% sRGB

X1 Extreme G2 is i7 9750h + gtx 1650 + 32gb and the screen is 4K but I'm going to replace it with a 500 nits FHD model because currently It's difficult to have more than 4h runtime with it.

I like from the T480s that it has WWAN and longer runtimes on battery

I like from the X1 that is a beast when plugged to AC and very quiet on battery (I have to admit, it's undervolted and disabled the turbo on battery mode),

I don't usually play games but I can use the gpu acceleration in some apps or when using android emulator. I expect to get around 6-7h runtime from it with the FHD screen.

One thing I dislike from the X1 Extreme Gen 2 is that it runs a little hot when plugged and max mode enabled in windows power settings, fans are most time blowing and temperatures between 70-95º. I did a repaste recently but same results.