Yeah, I'd be waiting for the 3G version. There's no reward to being an early adopter of new technology. You'll just end up wishing you'd waited a few months and got the sorted one.