I agree with most of your comments, but IMHO the iPhone is much more polished which results in efficiency for me.
I did want to point out that there are some great forums for the Droid, Droidforums.net. As it turns out, apparently there is a film (oil,...) that the Droid seems to com with from the factory. Once this is cleared, the camera works much better. You can search and read about this on the Droid forums.
I don't care what you read, the camera on my droid is awful compared to the one on my iPhone.
Each day I spend with the droid, I really appreciate just how great the iPhone is.