You've come to the right place! Welcome to CPF!
Sounds like you have things pretty narrowed down. Here's some things to think about:
As you increase the power of the lamp within a given reflector size, you will transition from throw to flood. For example, the P90, SR-9, HO-9 range of lamps have a pretty defined throw oriented beam. Moving up to a larger reflector with that same power bulbs (MN10/HO-M3) in a M3 bezel will tighten up that beam even a little more.
Moving up to an EO-9 in the Z32 bezel and you start to feel some transition to flood, but it's still a nice defined beam, just wider. Taking that same power level into a M3 bezel (EO-M3) and you will tighten it back down a beam probably similar to the P90 type beam profile. (estimated here)...
Moving up to the P91, and you're really using a floodlight now, the beam is still there, but it's very wide.... Moving up to the M3 bezel with a MN11 is about the same power level, but will pull some of that flood back into a tighter beam, but still wider than the MN10 etc....
Anyways.... what all this rambling really adds up to is the following:
Within a given reflector size, your maximum range for effective illumination doesn't change much when you change wattage, the beam just gets wider as you move up to more powerful bulbs. (there are some exceptions to this rule but you can follow it as a general guideline and it'll serve you well), so when you want to increase brightness while maintaining a similar beam profile, you must also increase reflector size.
-------------------------------
Personally, I think the 2x18650 C - M leefbody, with a Z46 (M3 bezel), and a tail-cap with your preferred type of operation would be a great setup. I think in the long run, it would be cool to try to acquire one of each of the available bulbs for it, the MN10, HO-M3, EO-M3, and MN11, so you could play around with them and see what works best. I'm betting you'll find that the HO-M3 will suit most if not all of your needs, while the MN11 will temp you on account of sheer power.