I would just take the battery and charger to the retailer you purchased the bike from, if there are any problems it should all be covered under warranty.
I ended up swapping my Evo29er in the end and am now the proud owner of a Merida espresso 600eq, which has the shimano steps mid drive...