I've also been looking for a replacement to an aging ThinkPad. My favorite option right now is the fashionably boring p50 from Lenovo. It's heavy and ugly. But you can get it with Xeon processor, multi TB drives and 64GB RAM.

Swoon.