Yes, that's the correct flashlight. (There is a difference between Fenix 35 and the Fenix PD35, you want the PD35).
And unless you don't need the charger for those 18650's keep looking on Amazon for one that includes the batteries AND the charger. Mine had the flashlight, 2 batteries and the charger for, I believe $79.
+1 for the Fenix PD35. I've had mine for years and absolutely love it. It's compact, durable (have dropped it from 10 + feet onto rock cave floor), and oh so bright. Multiple brightness settings extends the battery life as you only have to use as much light as you need. I often keep it clipped to the inside of my pocket like many people do with their pocket knives, which keeps it close at hand. I have a small dual 18650 charger, but find I only need to charge the battery twice a year or so with moderate use. I also have a small frosted plastic diffuser tip that snaps on the end of it and spreads out the light kind of like a lantern - useful at times. You can't go wrong with this light. Photo with diffuser.
18650 battery quality is very difficult to find, I just trow two ultrafire away:
-charger says full after 10 minutes but output is very low, light is very dim.
I have one good (but expensive 15$ per piece) 3400mAh EQ EDEN panasonic Li-ion and same quality seems Enerpower NCR18650B 7A PCB Button-Top Li-Ion
One movie shows how a battery pack is filled with sand!
I have one of those big led lights but they work far better with a separate 12v 7amp battery and many problems can happen from faulty contact in the screw on part: flickering, trouble.
If you test with a paperclip you can find where the bad contact is has had me puzzeld a few times, clean thread but still bad contact.
I use a headlamp princeton tec APEX that is used on mount Everest (same as repairing a cruiser) princeton tec APEX | eBay