You might have to leave the major names behind, and might have to skip a few features. Do you need the latest and greatest anymore though? When Android was new (2008) CPUs were much slower and upgrades did help your experience. (I remember missing calls because my phone couldn't switch to the phone app quick enough).
I cannot change that. The ~5,000 I have spent on smartphones and laptops in the past 10 years is hardly enough. My buying choice, yours, and the GP's are just not strong and valuable enough to cause a manufacturer to pander to our desires.
The economies of scale and the greater money available from the opposite are so bad that no one even makes an expensive phone to capture our tiny segment of the market. They all chase the thinner, glued-up, bloatware-filled, non-repairable, closed-source, 2-year-or-less buyers. Same story on laptops.
In fact, my purchases seem to have the opposite effect: the Nexus is now as expensive as any other flagship. Motorola's cheap stock Android phone line shut down. LG stopped installing removable batteries. MacBook Pros still have nice hardware, but they are completely glued up. Thinkpads still have crappy stock screens.
But there's incredibly little ground to call any of their current laptop lineup upgradable or repairable. I'm not sure there's a single upgradeable component left on any laptop they currently offer. The Macbook and the Macbook Pro have both moved to soldered CPU, RAM, and flash memory. The Macbook Air I believe still has a replaceable SSD but it has the proprietary connectory. To further complicate things - the batteries in the Macbook and Macbook Pro are both heavily glued in, so even that's difficult to replace.
Who would those be? And who of those is not on the high end phablet side of the phone market?