The story is pretty simple: I have a Droid X which has terrible battery life. Seriously it is almost dead when I get home from school (with charging overnight); the only time I use it is at lunch. My upgrade is in mid May. Everyone in my family has an iPhone, and I can afford one with my job. I am very stingy about product release cycles. I don't want to buy a 4S now if there is even the slightest chance of a new one being announced at WWDC. I might even wait until the fall if I have to. Any advice?