1. If you had switched to old baseband, flash the new one..
2. restore nandroid backup
3. from recovery flash the original recovery(its somewhere in development section)
4. now unroot using one click and you are good to go...
Press THANKS if I helped...
Open dropbox account from this link and we both get 250MB additional space