New Phone?

Currently I have an I-Mate SP3 and a JasJar.  Unfortunately, they seem to be nearing the end of their lives.  Which means I now need to look around for a new phone.

I've been reading reviews and am a little stymied.  This review of the TyTN from HTC (the guys who make the I-Mate) was very positive but I fear it is a little too big.  Also, the camera quality isn't what I have been hoping for.

If need be I will again go with the two phone approach.  A very small phone with no keyboard, and a bigger phone with a keyboard and an SD slot.

Here's my combined list for an ideal phone:

• T-Mobile compatible
  
• Windows Mobile 5
• 2.0+ Megapixel Camera
• SD (not mini) slot
• Regular headset jack
• WiFi
  

If I'm going with a small phone, it should be really small, clam-shells are okay and need not have the SD slot or WiFi.  The larger phone needs at least the same resolution screen as the JasJar.

Any thoughts?