So, after starting this thread and getting pretty annoyed at my battery life, I called HTC. The guy wasn't that helpful. I jumped through all the hoops, just to show that I hadn't got anything running that was going to kill the battery. I understand that he had to check a lot of things. When I got nowhere, he told me to run down my battery to zero, wait until the phone switched itself off, then charge it again. I hadn't done this since after its first charge. I agreed to do that, but got a case number, because I was sure I'd be calling back to try to get a better battery.
So, I turned on GPS navigation and Pandora and killed the battery over the course of around an hour (from 22%). I took the battery out, left it sitting out for maybe 20 mins, and recharged it overnight. I was shocked to see that it actually helped a lot - now I'm able to use my phone throughout the day (8-5) and have around 50% battery at the end of it. Nothing like the first day, when I tried to show it to some friends at 2.30PM, just to have the battery die in mid Google Goggles demonstration.