Have a look on reddit for /u/xueyao. He makes a couple of modded Thinkpads, including the "X330", which has the X220 keyboard, a 13.3" FHD screen, with plans for an 11th gen version early next year. There are mods aplenty apart from those ones. Internal USB instead of BT, a second MSATA connector, and the currently popular (and on my to-do list) USB-C charging mod.