I have an iPhone 4 with OS 4.0 and baseband 01.59.00. I have not upgraded to OS 5.1 because I was planning to unlock/sell this phone and buy the iPhone 5 when it comes out. But now I want to upgrade to OS 5.1 for all the bells and whistles. Should I wait? or just go for it and upgrade?