I doubt you're looking to burn more money but you could also try the framework laptops, I hear they're very well supported. Older Thinkpads also work if you want something cheaper (I don't really use my X220 anymore but I could never get rid of it), but then you do lose some performance.
I had a look to the Framework one, however, I've read (here, on HN, mostly) things about the battery life, the screen size and the feeling of flimsyness due to its DYI nature that were a turn off for me.
