Less is more. A gunshot wound at the range is going to be treated with big ugly stuff in a big ugly way. Tourniquets, IBD, and gauze. As far as tension pneumothorax decompression goes stay in your lane. I see nothing wrong with having the stuff to do it on hand even if you yourself aren't trained to use it in the off chance a bystander is able to use it, though it is very unlikely to be needed before first responders get there.
When you pack the bag put the shears and gloves on top. Headlamp should be able to be found in the dark.
CPR mask, NPA, and J-tube should be on the bottom. They need their blood more than they need their air. Without blood air is useless. In the air kit put in a few big sharp safety pins. If you can't get in an NPA or j tube because of facial damage you might get on down the road by stuffing the j tube in long ways between the roof of the mouth and jaw and safety pinning their tongue to their lower lip. If the roof of the mouth is broken just use a stick or something long ways to hold the mouth open.