In my point of view, M50 would be a better option. As it is lightweight and cheap comparatively to M90. In the same way, we can't ignore the unmatched power of M90.
I think 20-25 miles is a good reserve space for any bike out there and almost every touring/cruise or any other type of bike has almost the same capacity.