As a lifelong Mac user, it seems 2015 MBP was "peak Apple" and I've also been frustrated with more recently released machines.

This is probably not the answer you're looking for, but - I built a desktop Hackintosh for flexibility, repairability, extensibility. It dual-boots Ubuntu, for now. I'm migrating off of macOS gradually, and looking at Thinkpads for laptop.