It will not pick up wifi or Blue Tooth anymore. Everything else works. I brought it to the Apple Store and they said "buy a new phone". My question is should I wait until the new iPhone comes out? I understand that if I do then I will probably be waiting until June or July. If I get the 3GS unit now then I will be kicking myself in June. What would you do? How much better will be the next version? Leaps and bounds or a incremental change?