Hey man. Why don't you just one click back to stock and that will give you back and lock everything. Then reroot and unlock the bootloader? I was gonna mention this over there. I think no matter what route you take its gonna wipe your phone. Also with the issue your having returning to stock might not be a bad idea.
Sent from my Nexus S 4G using XDA App