iPhone 2.0 - How much longer?

I can not wait for iPhone 2.0 to get released to the public.  I am one of the enterprise users that have been in love with the device, but unable to support an enterprise rollout due to missing features like remote wipe, and Exchange 2007 connectivity.  I hope they roll it out before July 11th, but who knows.  I would think that the 3G phones would already have 2.0 on them when they shipped, so hopefully us first generation iPhone owners won't have to wait too much longer.