I'm interesting in getting an iPhone for the wife. I currently have a 2G unlocked phone on T-Mobile. The question is, should I buy the 3G with the assumption that the unlock will come out much sooner (once the 3.0 unlock comes out)? I'm assuming with the hardware respin, the unlock for 3GS could take months. Her phone is on her last legs and we need to upgrade soon. I'd like to get the 3GS if possible just to have the latest features, but if the hardware change will make an unlock difficult, I can be willing to settle for the 3G.