TF32650 are still probably your best bet and widely available. I have several of the unprotected version I use in a Fenix TK70 mod (2S cells, 3 x XML2, buck/boost driver). Highly recommended.
Test/Review of TrustFire TF32650: Test/Review of TrustFire TF32650 6000mAh (Black-red)
Search finds several more articles and places to buy.