Thank you all for the suggestions. For those keeping track:

- Samsung I5700 Galaxy is not 3G on T-mobile
- Samsung Wave is not available in the US, it seems, and is pretty expensive
- Nokia 5230 Nuron doesn't have WiFI

At this point I'm probably going for an HTC Magic or a G1.