16340 (unprotected button top) recommendations?

So I’m in the market for 16340s. One of my 16340 lights (Kodiak Kub, 1000lm turbo that pulls a bit over 3A on turbo out of a healthy fully charged cell) needs unprotected button top batteries and unfortunately the market seems to have changed since ~1.5 years ago. Just retired the OEM no name ICR one due to reduced brightness due to increased voltage sag, and my two Imren 7A rated ones are starting to lose some capacity but still perform decently. Basically I need something that will perform well with minimal voltage sag during aggressive turbo hammering, has at least 3A CDR but 5-7 preferred, and an optional bonus would be something that won’t degrade over several dozen cycles being charged at 2A like I do with my current cells although if they are not super expensive I dont care lol cause my time is worth more than a few bucks (as long as nothing explodes) :joy:. Any recommendations? Thinking about Vapcell T8 or T9 at the moment since those are cheap on Li-ion Wholesale at the moment but am wondering if there are any other better performing options since IMRbatteries quit stocking 700mAh Imren and Efest 7A ones so I can’t just get Imren again despite liking the performance I get from them.