Would you be willing to download and flash a RUU? A RUU (ROM Utility Upgrade) is a windows program (but if you don't have Windows, I can find a ZIP file for you) that will re-flash everything on your phone. Everything is 100% stock from HTC. But rooters use RUUs to recover a device they have royally screwed up, so the link is from the root section. Again, it's 100% HTC stuff and you won't be rooted if you run it. It doesn't void your warranty, because it doesn't unlock your device or anything. It even guides you through installation. All you need is HTC Sync installed and it should be good to go:
That's the most recent OTA (2.17.651.5) file. Consider it like a super factory reset. The file service likes to pressure people into buying their service to download, but if you refresh semi-often, you'll get a free download slot. I kinda wish HTC would just host files like these on their servers, TBH.