I'm afraid you're going to have to bite the bullet and do a factory reset. I know it's a pain, but HTC backup will help (I assume you have it on the M7) as it backs up more than the standard Google one. Do separate backups of your content as well and make sure your contacts and calendar are fully sync'd first. A reset would be part of any repair process, so you won't have lost anything in the long run.
