I'd recommend the Treo - having just recently lost mine due to an unfortunate water outing - I've lost some productivity as a result of going back to the my T5.
The keyboard actually makes inputting faster. And as Seth stated, WIFI is not prominent in many areas - guarantee that you'll have...