Gearbest/Fasttech for both, if you don't mind waiting. Beware of ebay, as it is the most common source of fakes.
18650s: SONY VTC6 (US18650VTC6) or Samsung 30Q or LG HG2 - (all 3000mAh)
Charger: Nitecore i2 for 2-slot charger or Opus BT C3100 for faster 4-slot charger