I also run a layered kit very similar.

I do have a twist. I am lucky in that I am expected to have several weapons on me at any given moment at work.

I have the normal stuff that I carry every day. A small leatherman micro, a healthy folding knife Benchmade Barrage, a compact pistol G-27 with a spare mag. a very small led light and a fire steel tucked into my wallet. Add my phone and you get the gist of it.

I carry a sling bag that looks like a small gym bag. It has a full sized pistol with a light, several spare mags and another knife, another multi-tool, a real flashlight, a trauma kit, a hygiene kit, paracord and a good set of gloves. Add another smartphone to that bag as well.

In my work rig, I have another pack with a little more gear and a rifle with extra ammo, adequate tactical gear (persec) flashlights, maps, tools and adequate gear to finish the job and to get home.

At any given time, I have enough to get out of a bad situation in stand alone kits and the ability to combine kits for a longer situation. This gives me flexibility.

The one thing I wish I had, is adequate water. I have to transport it daily. Leaving it in the rig to freeze isn't going to cut it.