Exactly, need high output and for a decent duration, 16340 is not a good choice. Personally for EDC type uses, 16340 offer a nice form factor, happy medium of output/run time. Short blasts of a few hundred lumens are no issue, prolonged uses where say 40/50lm type outputs are enough, again the 16340 cell works fine for me. Unfortunately, even 200lm will eat through in 20-30mins .
Spare cell(even better if stored in a spare light! Haha) would make sense. That way if you do need your 200lm output, you can at least get 40+ mins of it.
I tend to use around 140-200lm as a work light output for example, it's floody(if focused I could get away with probably 50lm). But it's not easy for me to work with, I need flood bias mostly for my type of work application. Now using 140(ish) lumens , I would not even consider a 16340 fed light or headlamp. I would be swapping the cells out every 1/2hr or so. So it has to be 18650 for those application types.