Thinkpad, hands down.
The T60p will have much better ergonomics. It does have small niceties that you will like (night light and such).
Also, it offers the option of having a built-in CDMA (cellular) connection, so it has Internet anywhere. If you decide not to, you can always see if you can find a TV Tuner MiniPCI Express card. Having two MiniPCI slots gives you lots of flexibility.
Above all, Thinkpad exudes quality. I recommend you to go for it if you can.