For those that have been looking for replacement batteries, I went to China and got a Yamaha motor battery replacement that is 17 Ah, stock Yamaha battery is only 13 Ah, and for 1/3 the price of a stock one.
Works great and more battery capacity has extended my mileage range.
I ride in faster...