It is all working now apart from one panic where I appeared to scramble the recovery image (ClockworkRecovery) and had a heart stopping wait to see if I had bricked the phone. This appeared to be related to ROMManager being linked to all zip files on the sdcard.
Now I am trying to reduce battery use, I have been using androidforums again, more specifically a post on undervolting, but need to calibrate the battery first, something I have never done. The instructions on androidforums use a LordMod set of apps for undervolting, but I have also read that CyanogenMod is already undervolted. I think I will leave it for now. The calibration is clearly needed though. My phone is charging, the battery says 100% but the current is still flowing in to the battery!