Your mistake will be rectified, somewhat, once the software unlock arrives. But then, you'll still need to play the cat-and-mouse game with Apple with regard to firmware updates. The HK and NZ iPhones dont even have to worry about this.