Have you tried printing a 3C to 2x 18650 adapter for Defiant 3C light? The two 18650 cells would be connected in parallel to extend run-time. My Defiant 3C eats through a single NCR18650B cell very quickly.