The M21a is basically a C8+ with a larger cell, so that will possibly suit your need for long runtime on max when using a Samsung 50E.

A flooder with a small head?
Hmm, most flooders have a larger head