iPhone 3GS 32GB or Droid?

So, I'm really close to being able to upgrade my 3G 16GB soon (this coming Monday). I'm on the fence on if I should wait or upgrade to the 3GS 32GB. I just know as soon as I do, within months, Apple will release a new phone (happened last time, even though I knew it was coming but didn't know when).

I'm also curious about the Droid. The tech stats don't really mean all that much to me. I hear the keys on the pad are very small. The camera looks to be a lot better than any iPhone. Both can capture video. The Droid's memory and storage specs leave a bit to be desired, although it will take an external card (up to 16GB of microSD). Apparently, the Droid will chew up and spit out a freshly charged battery, although I've heard multiple people stating that the phone would need to be tuned (similar to when I tuned my phone to lessen battery consumption). Verizon's data plan has dropped to $69.99, according to some of the TV commercials I've recently been seeing. That would put a Droid close to what I'm paying now for my iPhone service. Both can tether and both can use headsets to voice-dial.

I could try out the Droid and return it within two weeks of purchase if I don't like it...wondering if I'd be wasting my time, though. My experience with Apple is GREAT and I'd definitely want to purchase through Best Buy and purchase their accident plan like I did with the last pone (and ended up dropping it not long after purchase, which Best Buy replaced for a small fee).

Basically, I'm afraid of giving up the Apple experience. I'll make a decision on what to do soon...but really, there's no rush to become indentured by another phone company...again.