Should I wait for the 3G enabled iPhone?

It should come as no surprise that Apple will eventually reveal a 3G enabled iPhone. There are rumblings that Europe will be seeing one by the start of 2008, and others say that Apple has already working on the next iteration to run by the FCC. The iPhone supposedly didn't come 3G ready because 1% of Cingular's U.S. users use the network, as opposed to Europe where 3G networks are much more widespread. My problem is that I'm addicted to cutting edge technology, and when I know something can or should be better, I don't like dropping the cash until it gets there; and I am torn between the iPhone and the cheaper 8525 which has 3G but uses Windows Mobile and isn't nearly as y. What do you think I should do?