Have done it the freeze way (currently that way) and have also done it Kenny's way (actually...did that for TPR 2.0) but I would defer to Kenny's way as probably the most effective, but if you do have problems, freezing it works.
I think that is what I am going to do and what I did last time. I believe I also need to go to the market on my browser and fix my phone info like last time. Full wipe sucks! Lol
Sent from my SPH-D700 using XDA