The batteries that are a tight fit will be even tighter if they are double wrapped. I think one just needs to keep extra wrap on hand to deal with each battery tare as you go.
I think the scariest was when I tried to put a brand new Trustfire into a tight holder, where the protection circuit sheared off causing a short and the battery to heat up and a sprint to take the cell outside. I still am a believer in protected cells, since once I figured out how to insert properly (or modify holder for more flexibility), the problem should go away in theory. While, a short in the light, water penetration, cord short, or over/under discharging, in real world is more likely, actually a certainty.
The incident does make me appreciate the need for some JB weld to reinforce things and make this near impossible. I sounds like the fenix cells arb l2 may do something like this at first read.
I do wonder if several thin coats of some epoxy over a bare protected cell would offer more "cut" and impact resistance than vinyl tubing. It would be easy to test if I had the time, materials, and cell that really needed repair... As far as epoxy paint goes, there are some good ones, but I am guessing a glue would be better where cost per gram is less an issue.