Should I get the iPhone 4s or wait until the battery problem is 'fixed'?

[i'msocute1]

At the moment I have the HTC Thunderbolt and I am unimpressed. It has a VERY bad battery life and there are many problems with it. I was going to ask for the new iPhone 4s for Christmas and my mom agreed with the idea until we recently heard that the iPhone 4s has a very short battery life. I did a little research and found that Apple is supposedly going to fix the problem in a few weeks. But I also heard about the iPhone 5 coming in January but I don't think I'd really like it, it looks like it would break to easily because of how thin it is. So my question is, do you think the iPhone 4s is worth the wait or should I look for something else?
There are things I really like about the iPhone, like the new Siri, the color, the camera quality and the apps. I'm just concerned about if the battery is better or worse than the Android.