[Liskni_si]

Not a solution that scales, but if you really want a modern CPU variant of the x230, check this: https://www.xyte.ch/shop/x330-pricing-list/

They also have the T25 frankenpad: https://www.xyte.ch/shop/t25-frankenpad-kit/ and https://www.xyte.ch/thinkpads/t25-frankenpad/