Buying a locked-down Android phone is worse then buying a iPhone, as far as a end user is concerned.
As far as an end user is concerned, she can't "just" upload music or videos to an iPhone using Linux - which applies as we are at LWN ;-). Nor do you have a physical keyboard.
Still regarding end users, AFAIK in the countries where they can get away with it, it seems that Apple/Telecoms actually plan to not release unlock codes to customers once their contract finishes.
Regarding the freedom point, you ought to reckon that the software platform is freely modifiable and redistributable, while the iphone's is proprietary; and that a sale of a "locked" G1 strengthens an open platform, an iphone's not so much.