The iPhone.
Whatever you decide, Kevin, I'd wait for a couple months. Cingular is supposed to announce their new 3G broadband network sometime in Ocotober or November, which is as fast as EVDO. (EDGE does not compare.) Supposedly, they've been deploying the infrastructure in major markets in the last two years, and should be able to "turn it on" later this year.
Juan