I know the Yamaha charger is a bit of a lump, but I take mine with me and charge the battery back to full before the ride home.
That way my own 10 mile ride home uses about 40% of my full 400Wh battery and I take it in the house and leave it alone until I next use it, this gap could be several...