the tour, hands down.
i've had mine since the day it came out. no complaints. the wifi isn't a big deal to me because the 3g works just as fine, if not better
the screen is really clear and its an all around really really good phone.
id stick with it!
