There is a Fenix novelty called TK39
It looks vaguely similar to TK35 and has 10,000 lumens
It is 2x 21700 but it is possible that with adapters it can also work with 18650.
Maybe when it's released it might be worth looking at?
Looking at the new lights 2019/2020 it seems that Fenix loves this new battery format very much but without an adapter supplied with the flashlight I will not buy these news (I have too many 18650 batteries to abandon this format)
I'm afraid we may never see 2x18650 again..