Estel: If the core C4 state issue is not likely to be caused by a faulty battery, I might put off getting a new battery till I resolve the issue.
I've read through some of the posts in the battery thread - thank you for summarising it nicely, all over again! Unfortunately, none of the recommended batteries are available where I live.