Currently own a 16GB 3GS, officially unlocked by O2, in warranty until Jan 2011. My screen has dust underneath it, which as I understand warrants a replacement. The previous plan was to wait until the new Windows 7 Phones came out, get the iPhone replaced and then sell it immediately after to fund the W7 phone. However, typical Steve Jobs has gone and announced that Apple are replacing the 16GB and 32GB 3GS with only an 8GB. My question is whether I should go an exchange my phone before June 25th so I can get another 16GB, or is it better to wait try and exchange it later in hope for the 4g?