Yeah, that's how I see it too.Steve will make his return in June. He will be the one introducing the new iPhone. Like a grand reappearance almost. Twice to talk about, twice the media talk.
Then expect the iPhone to be sold a few weeks later. Its more than likely going to be in the July timeframe.
Steve said that the iPhone is a product that's "near and dear to my heart"(WWDC 2008).