Apparently the “older” ones like T480 had crappy screens and it changed with, tada! , the T490 generation q. I’m quite happy with mine to be honest. I got a french keyboard, thinking about getting the US one with that Big return key :-D but I’m curious about what your “retrofitted classic keyboard” is (it appears it is quite simple to change the keyboard on ThinkPad)?
You never know the shenanigans of a machine, and one million is largely enough for me until I die, or if science gives us the option to live forever I bet machines will do the work for us :-)
Edit: as I believe the machine can be wrong, I’d probably take A + B