I know someone who works at Apple and he is almost too excited for words about what may be happening there in the next several months.
Maybe in the iPhone, maybe in other areas, he won't and can't say anything specific. He'll be working a few sessions at the WWDC if you can make that.
My wife is even toying with the idea of getting a Blackberry or an iPhone so she can continue working while sitting in any kind of boring situation not needing her attention. I'm interested in any comparisons between these two products. I'll be searching the web today. But we'll gladly wait a few months if a better iPhone is on the way.