Just some follow up on the battery issue. I changed my e-mail checking (2 imap accounts) to 30min from 5min, installed the v46 power kernel and am now undervolted and oc'd to 850 using the 'Ideal' settings.

Battery life is now superb! Far better than original, and the phone is snappier and just better. Even better now it has the wonderful CSSU features too, especially portrait mode email support

Nicely done everyone involved