The sleep/wake button on my phone kicked the bucket a few weeks ago. I'm still under warranty and everything and I was told I can just trade it in for a replacement. If i wait until the 3GS comes out will I get a 16gig 3GS as a replacement or just an old 16GB 3G if they still have them in stock?