When it's time for me to upgrade I'll go with one of the framework machines. [0] It's fully customizable, with room for future upgrades. I've been looking into a Dell machine for a while, but they just seem to have too many issues.
For what it's worth, I'm currently using an m1 macbook, and the battery life is absolutely incredible.