Dont get me wrong, I love the android platform and love the Droid from Verizon. The network has been much more solid than AT&T and quite a bit faster in my area.
That being said, the new iPhone "should" trump the Droid. Not because of the network, but because of the polished apps. You can say what you want about the amount of apps to choose from, but its all diluted. I found every app on the droid that I used on the iPhone (save beejive). The difference is, the iPhone apps are about 10 times more polished. They just look brilliant, open instantly, etc. Coupled with the new hardware, its really going to put it over the top. Higher resolution = far better user experience for me.
The above results in a far better user experience, and will be why I will switch to the iPhone 4 whenever it comes out regardless of carrier. Android just needs apps that are more polished and less cumbersome.
Not to mention push services are far superior to background services.