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.