Planning a few big multi day rides and a spare battery is going to help things. Bike has the e8036 630WH battery in it but they look to be out of stock or priced through the roof at the moment. Seen a few of the e8035 540WH batteries available though which would probably do me. Are the e8035/e8036 the same dimensions/connectors etc and will fit in the bike or do I need to stick with the e8036 battery? TIA