Steve, to your point 2) above, I'll say this...
Sure Apple still has some catching up to do with respect to RF, voice (audio), and camera performance compared to Nokia, SE or even Samsung.
But the reality is that they have the resources to hire experienced engineers in these areas so they should have little difficulty in improving their design and adding features like 3G to the iPhone!
Historically Apple is a not company that likes partnerships. In the long run, I don't think Apple is very interested in the iPhone being tied down to specific carriers.
I think they chose to partner with the carriers (like AT&T in the US) to help launch the device and recoup some of the development costs (via very favorable revenue sharing).
I also think that as high-speed wireless data services become more widespread (be it 3G, 4G, WiMax or even WiFi), Apple is going to move away from traditional services (voice over GSM) to data services (voice over IP).
Imagine an iPhone with VoIP - using WiMax and/or the upcoming 700 MHz US band as well as WiFi (all of which are network independent) - and with a legacy GSM radio only used for backup.
Such a design allows Apple to circumvent the (very long by tech standards) 5-year exclusivity agreement with the carriers, and gives them an opportunity to expand the market.
My reasoning behind is based on the following quotes from Steve Jobs:
Question about Voice over IP. "Initial take is that we will only limit voice over IP over the cellular net. We'll allow them over Wi-Fi?"
"We have great relationships with our carriers, and Apple's responsible for the software on the phone, so we define the software, we distribute the apps, you have an iTunes account with a credit card, and really, this is our program, and we're running it." Do the carriers get a revenue share? "We're not going to get into details, but generally we like to see the revenue flow the other direction."
See: http://www.macworld.com/article/132376/2008/03/liveupdate.html