Sounds like we have had a similar experience! But I have an update....
Found out mytt 5 mile limitation was not due to battery. There is an internal temp sensor cut-off (or something of that nature), My ride to work is 9 miles of multi-use path. I can just leave the throttle wide open for miles...