Talk to @Jenny Mao and see if she can have one build for you.
Lots of forum folk's got one from her and are very happy with it.
Myself still waiting for the wife's approval before I can place my order.
I introduced the shop I used to do support for and @Jenny Mao has been incredible. My new 21700 battery when tested is exactly as specified. She’s an incredible young woman. Honest, straight up, and honest. A real find.