Your best off following the updating wiki and flashing your phone.

Make a full backup first, then restore from it once flashed and it will reinstall all your programs etc.

All in all it should take no longer than 2 hours, start to finish.