I'm on buyer beware mode right now. I have a feeling the second generation iPhones are close by.
I don't think you'll be seeing next generation iPhone this year. You might see minor updates, such a storage, perhaps even 3G, but you're not going to see them totally redo the iPhone a few months after they released.
Come on, they don't even come out with totally redesigned iPods every 6 months