I have a pretty unusual query but maybe someone can help. My 3GS was unlocked in Bangkok and the baseband upgraded to 6.15. The only reason I JB'd it at all, was to break the SIMlock. Now I am able to officially unlock via Deutsche Telekom Germany, and I would like to do that and then upgrade to iOS5 without all the jailbreaking hassle. My question: is there going to be any trouble doing this with the baseband at 6.15? Like, I don't know, Apple detecting the baseband and bricking the phone or something? Or should I wait until I can upgrade to jailbroken iOS5?