I had a SIM PIN on my phone and misinterpreted to think my phone hadn't been unlock so ended up unlocking it twice. It seems what I should be doing is revirginise to remove the anySIM lock, upgrade - how? and then unlock. I can use OSX or Windows XP.

Wher's the revirginising tool? Is it one of these? Ideally there's a one-button solution for this.

I assume if I've virginised, I can update in iTunes. Is there any need for OKtoprep, I suspect not, given the new tools available since then.

To unlock, I read IPSF doesn't stick, I can use iNdependance.