I know what you mean about the D2s, Luke. Best cameras made, and I still have three of them, including a mint D2HS. Once you use them, anything else feels toy-like. Having my best one fail prematurely is a big disappointment, but I'll get over it. A clean D2xs might well be the way to go.
Guys, thanks, this is helping my resolve. And no-one even said 'D4xx'! 8>)