FDR has tended to fix my phone issues, and if you're rooted and have Titanium Backup up and running it's relatively quick and painless.