Should I Keep it or Wait?

[KidKobun]

I just purchased an HTC One X a little under two weeks ago, having come over to Android from an iPhone 3GS, and I absolutely love it! Albeit, I am a bit bummed out that some apps on the iOS App Store still aren't available on the Android marketplace, but whatever not a deal breaker.

Anyhow, I have been hearing rumblings online, and a friend of mine gave me a soft confirmation that the HTC One X+ should be available in the US in a couple months. So my question(s) is/are:

With only a couple days left to decide whether or not I should keep the phone or return it to Wal-Mart and still be eligible for an upgrade, should I keep the HTC One X or wait for the HTC One X+? Will a quad-core processor and all of the other rumored features really make that much of a difference, and do you think that we'll see a 32GB model?

I think I can tough it out with my 3Gs for a bit longer, but after having such an amazing phone like this, it is going to be one hell of a wait.

Any feedback, opinions or advice is greatly appreciated!

EDIT: I will say that this phone could definitely use a longer lasting battery. I use it to listen to music in the morning when I take a shower and get ready for work, and by the time I arrive to the office about an hour later I'm already down to like 75% battery. By then end of the day I am usually down to 20-30%, and that is with light usage. That's ridiculous!