Okay, my current light set up is fail. Though on a budget, my inability to ride at night is now costing me money- my boss wants me to be at work as soon as I can get there. Currently, that's 0700 but I can make it there by 0600 if I ride 9 miles of MUP and then 8 blocks from the trail head to the bus station.

I realize that delivery times from DX out of Asia can be lengthy. They do have a couple of lights that appeal to me that they stock in their US warehouse. However, I didn't see chargers or batteries in their US warehouse. Any domestic sources that I can order decent, yet extremely affordable 18650 cells and charger from?