Sure, the M1 should be somewhere between the two. Because it has an orange peel reflector, it will be somewhat floodier than another light with a similar sized reflector and emitter. There are a bunch of other lights that fit in there, too.

Keep in mind, if you want an 18650 light with about an hour of runtime on high, and you want the light output to be pretty steady over that period, you are limited to lights with a regulated driver and somewhat under 3A current limit.

One idea, the Eagle Eye X6 with XM-L2 (not the XP-L HI model, nor the similar looking Astrolux S2).