May have missed it, but did you also clean the charger? Cotton swab and alcohol. Also, I was told there were issues with the charger elbow adapters and that's why the switch to cords. May be just the adapter and not the whole charger.
ETA Sorry just read the battery part. Ah well, keep for
mod parts.