I had the same battery issue with my Crosscurrent S, with a 21 amp/hour battery, and seem to have come up with a solution. One that has worked for me anyway.
When my bike arrived, I noticed that the hole for where the lock engages on the battery was enlarged, possibly because customers were...