I have a Framework that I love and bought for that exact reason, but recently Lenovo seems to have upped their repairability game again as well:

https://de.ifixit.com/News/115827/new-thinkpads-score-perfec...