If you are three months out from an upgrade, then wait it out. By the time you upgrade, the phones you are looking at now will be old news.
I am in the same boat as you, and personally, I am waiting for the new quad core lineup to come out. Whichever has the best battery life and a quad core...