Another point - are you using the recommended high performance batteries in your maxtoch? I mean Maxtoch or Panasonic 3400mAh batteries - not ultrafires, trustfires or other lower output batts. The 3400s will give plenty of runtime in an earlier M24. In six hours shooting - allowing for light off time - you should change batts twice. That takes one minute each time - and you can carry a night's spares in a shirt pocket. This is not hard. And if you get yourself a nitecore 4 batt charger charging is also very easy.
Follow Brian's instructions (above) re the mode memory and you'll be fine there too.