What lights do I need in my collection?

Coming back to this thread, i did buy the Wurkkos WK30, arrived today, its in covid quarantine before i open it.

I find i miss my XM-L Convoy M1, not sure if i should replace it with an upgraded Convoy M1 or something in a similar form factor (it seemed to have about the perfect all purpose light form factor).

Also for a tube light i miss my XM-L Convoy S2.

I am considering the Convoy M21B and S21A but apparently the S21B can’t hold full lumens long and has a green tint and presumably the M21B would have the same green tint issue.

So no decisions yet. Looking for an all purpose light with lots of lumens and a tube light the same. Both in 21700 preferably. Suggestions are welcome.