Anyway to clock the phone to what it should be
You would need to root the device and install a custom overclock kernel. The easiest way to do this is through Andrew's tool- [TOOL v1.8] Superboot 768,880,920,960mhz + Recovery + Utility fw 1.100.xx & 2.100.07 - Forum Android Italiano (it is in Italian so use Google translate to translate).
Here is his thread on MoDaCo if you need him to help you with anything in English- [TOOL v1.7] Very easy install tool for Superboot 768,880,920,998mhz + Recovery + Other! - Android @ MoDaCo
Your battery life isn't bad enough?
Separate names with a comma.