Have you tried using SEUS to update your phone (use a2uploader to change CDA first)? This greatly reduces issues with mismatched MAIN/FS/custom files which can lead to issues similar to that.