iPhone all the way here! And, yes, I think the iPhone 5 is supposed to be announced within the next month or so . . . not sure when it will actually be available, but it should be something this fall. That's the rumor anyway - but, Apple rumors are usually pretty reliable.
Oh - and Julie - since you already have a Mac, the iPhone will sync so nicely through the cloud and everything. It will be seamless and slick. I really think you would love it.