AT&T Unlock - what's the best way to preserve jailbreak?

I have two phones that will be able to be unlocked under AT&T's new unlock policies. I'm told on their website that (1) that the unlock flows through iTunes and (2) I need to restore my phone to get the unlock.

I have an iPhone 3GS with the new boot rom and an iPhone 4. Both are running 5.0.1 and I would like to stay there to retain the tethered jailbreak. They also both have old baseband's in them so that I can unlock with Ultrasnow.



Should I now build two new 5.0.1 firmware bundles with baseband upgrades enabled and install them once the unlocks are approved?

or is there a way that I can "not" restore and mess up all of my apps, etc?

Quote from MuscleNerd: "For everyone enjoying new AT&T policy: use redsn0w's "Deactivate" option on "Jailbreak" screen to avoid restoring and losing jailbreak"