Based on my in-depth studies (ie, asking my friends), I think the 3G version is going to kill. I, for one, have completely ignored the curren version.
I'm more of a road warrior, so having virtually ubiquitous coverage is a must. I really can't see myself tied down at home or searching for wifi hotspots all the time. AT&T's coverage woes notwithstanding, the 3G version is going to slay.