Another rechargeable option for the 6p is the 17670 size battery. Single cell, and fits without having to modify (bore out) the flashlight body.
It's main advantage over 2 RCR123's is safety. You don't have to worry about the cells being charged to equal levels, since it's just a single cell. Not quite as much runtime as an 18650 size, but depending on your needs, probably plenty?
Think about the tint you are after. Super bright (cool) for blinding BG's, or neutral/warm for better color rendition outdoors. There are lots of led drop ins all of which are a snap to substitute for the P60/61 incan lamp assembly in a stock 6P. There are variations in tint and output level (some have multiple levels built in), which give different runtimes on a charge, all depending how you plan to mostly use the light.
GL! :welcome: