yikes! $30 for a batterycheap replament
Those 21700s are beefy. My PD36R uses one and I get a surprising amount of runtime between charges.
My favorite modder supplied a 40T cell with a spring soldered onto the positive end of the cell. It works great in my E4K. VC8 and S4 chargers fit the extra extra long protected usb 21700 cells.It may be worth noting that loose conductive material (like magnets) can cause a short, and there are a variety of ways to reduce that risk.