OK I had an N800 that recently displayed the rolling screen problem. Luckily my credit card company has a double the manufacturer warranty and is refunding the whole purchase price (about $200.) I've been VERY happy with the N800 so here's my dilemma do I try to track down a new in box N800, or should I upgrade to something else, and if so, what?

Here's my requirements for any new device (I've already determined the N810 doesn't meet my needs because it uses micro SD cards and is limited to 1)

Bluetooth support
Able to run a linux OS (doesn't need to come with it, I can load it after market)
WIFI
32 GB SD card support or a hard drive larger than 30 GB (prefer 2 cards but understand if only 1)
able to fit in a pocket comfortably (I'm not a guy who shops at big and tall shops, 5' 4" 160 lbs the n800 is about the max dimensions I'd take)

I obviously don't need it to be a "smartphone" but wouldn't rule one out (although I'm stuck in an alltel/verizon contract so it would have to be CDMA)
I don't keep up with all the competitors as much as some of the people who surf here do, anyone know anything that fits my needs at least as well if not better than the n800?