Well if it really bothers you to wait, or if you just can't decide, you can always sell it in 2 months if you really want to. That is IF(!!!) there is a hardware update. There is a good chance that Apple won't do anything about it until the next iPhone in 2011, so you would have been without one for 2 months and waited all that time for nothing.
Haha I know!! It's gently killing me. My roommate recommends waiting, and she is usually correct or at least more patient than I. My BB works fine, data plan and monthly cost is less, but I HATE surfing with it or having to go online at all (phone is not compatable with the new Bell/Telus HSPA network).
Oh the dilemma!! I have gone through 2 cell phones I haven't been completely happy with, I don't want this to be a 3rd one although I have wanted an Apple iPhone forever