The lights you got don’t require high drain cells, so you should go with some with higher capacity.
Look at Panasonic NCR18650B, NCR18650GA or Sony INR18650MJ1.
No need to go for protected cells as the light has built in protection.
As for the charger, you can look at the Liitokala Lii - 500, Opus BT-C3100, Zanflare C4 or Miboxer C4.
Get the one that you can find at the lowest price.
Unfortunately the lights are being shipped from china so I don’t know if they have single or both springs and I’d like to have the batteries here when the lights arrive.