Personally while the Droid 1 is on the Buy one Get One Free is cool and all but I would recommend going with the Droid X or Droid Incredible for a full touch screen experience, if you want the Full Keyboard as well as touch screen the Droid 2 is due out in Thursday. The reason why I recommend one of the newer phones is the fact that even after 2.2 Rolls out, there is 3.0 Gingerbread which minimum requirements the newer phones will be getting, so for longevity the newer phones will be better then the original droid.
As for the comment about you really wont use the newer phones to their fullest potential because you are not using the Storm to it's fullest potential is because you were not really happy with the storm *I cannot blame you actually it was not the greatest of the blackberrys*... I switched over to Android from BB but I had a Bold 9000 and I used every aspect of the BB platform because it is a great platform and I used the e-mail for personal, work as well as bbm because hr manager uses bb and I am the companies BB/Smart Phone support here. If you can afford it, buy one of the newer phones and get your fiancee a smart phone of her choice. Otherwise I have heard a lot of people love the droid 1 *I am calling it that since the droid 2 is out on Thursday*... I would go check all of them out and see which one you like even better!
HTH,
Charlie