Well, there is Nealgadgets for you:
You can ask him to include an 18650 and a charger, if he can for that last one.