I will update it for free with ICS XXLPH which is the latest version and no issues with battery. I am using my device without any issues.

Inbox me for upgrade. - ONLY GALAXY S2 please.