Some might find it silly, but using an HHKB over the existing keyboard solves the issues one might have with non-MacBook keyboards. It solves the bad keyboard

Some might find it silly, but using an HHKB over the existing keyboard solves the issues one might have with non-MacBook keyboards. It solves the bad keyboard issue, and beyond that the HHKB is genuinely an excellent keyboard. As an added bonus is that you can use the HHKB as your desktop keyboard when the laptop is in clamshell mode. If you really want the Thinkpad nipple, there's always the HHKB Studio, too.