I like giving Simon my business directly. He offers excellent customer service and recently installed a forward-clicky switch in a C8+ for me at no extra charge.
The listings for his lights that include a 21700 cell show a photo of the LiitoKala Lii-50E. I don’t know anything about them, but I found some folks discussing them in this thread.