AW makes great batteries, so does Panasonic. Several flashlight makers have started selling their own brand of cells (Nitecore, Fenix, Olight, etc), but personally I'd stick with either Panasonic or AW. Also, make sure you get PROTECTED (PCB) batteries.
As for a charger, I've been very happy with my Nitecore i4 intellicharger. If you only need two batteries, they make an i2 which is a little less expensive. As a bonus, the Nitecore Intellicharger will charge both 18650 battereis, as well as Sanyo Eneloops (and similar chemistries).