I sincerely hope Apple isn't about to do a replay of the Mac. Great introduction with incredible technology. But a few years into it, begins to stagnate.
HW wise this nothing like the iPhone 4. The iPhone 4 was a far superior device over the Galaxy S phones. The Galaxy S II though is pretty close to this. In terms of the raw HW I think I might call it a draw now. The camera is superior on the iPhone I suspect, but the small screen size negates that win.
Based on this trend, unless Apple has some aces in its sleeve, over the next year we'll see Android phones clearly pull ahead in HW.
SW though iOS still kills Android. Mango and iOS seem to be the ones that have the fundamentals down. I almost think someone needs to throw Android out and start from scratch. The inability for that OS to be stable and the fact that its still sometimes jerky on SGII HW is embarrassing.