Best hi-drain 18650 and 18350 batteries?

I have the vapcell 18350 and those have been highly rated. Sometime in the spring the manufacturer apparently changed the construction with some reduction in performance. I don’t know if that’s been corrected yet.