My 1 1/2 year old iPhone 3G had water damage about a month ago and I am eligible for an upgrade in about 2 weeks. I just started experiencing problems with it, but it isn't that bad and if it doesn't get worse I could deal with it until summer. My next phone will be an iPhone, but is there going to be a new one this summer? I don't see a whole lot they can do with the next version, so if there is a new one coming what will it probably have and will it be worth waiting for or should I get a 3GS?