iPhone 4S. Apple has better apps and OS. My wife got a Droid about the same time 4S came out last year. I dont know what type it was but it was a 4S competitor. She had it for two weeks and hated it. Lots of software glitches and the apps were not so good compared to even the Apple 3S apps. She returned it and got a 4S.
Especially if you have other Apple devices, get the 4S.
Example: The Air Video app. If you have lots of video or music saved to your computer, with this app, you can stream it through wi-fi anywhere in your house to any and all of your Apple devices. To my knowledge Droid does not have an app like this. You dont have to sink it through iTunes anymore, just downlaod the Air Video share program onto your CPU (Win or Mac) and allow sharing the files you want. Yesterday, my wife, me, and my son were all watching different things on our devices through this app. It only cost $3. Plus it is compatible with other media player devices such as WD T live etc...so I can stream it to my TV as well.