I'm starting to think the best replacement for my 2009-era Thinkpad is just another 2009-era Thinkpad. I don't want a glossy screen, chicklet keyboard, and non-replaceable battery.
Those damned glossy screens. I can't for the life of me figure out why they ever caught on; glare is extreme on them, dust and fingerprints might as well be completely opaque, and actual physical defects (scratches and such)? Game over.
The keyboard on the X230 is actually quite good, especially compared to its contemporaries. I believe you can swap it out for the older style X220 one as well.
(But I think I'll be sticking with my 4:3 T61 until shortscreens fall out of favor)