Adding to this: my buddy with a M3P suggested I get 18" wheels, tires, and aero covers for my M3P to swap to in the event I want to do a longer trip. Claims he did the same and it added 30 - 50 miles of range. YMMV (literally) but that's definitely something worth considering having on hand in...