Yes, I've had mine open and that's not the right size (too big) or type (protected) battery for Puffit. You want the next size down, 14500, not 18650.
Yes, it's a Li-ion cell, they all charge to the same voltage (about 4.2). You need one without protection built in (that function is done by...