Very happy to hear that I have some good options when my current Thinkpad finally retires. But I won't replace a perfectly good computer just for the sake of it.
Got a Thinkpad L13 with Ryzen 5 pro right now. Cheap, but it does the job. And best of all, no qualcomm wifi chipset. Mediatek, it's not intel but it works.
All USB-c, even 4G and smartcard slot.
Funny but the L13 has pretty much the same cons. Battery life is meh, and fans are noisy when I play games on it.
It doesn't matter, it's enough battery for a 4 hour work session on the go, which is more than I need before I need a break. And when I game I have the sound turned up anyways.