If it was me, I'd really be looking at reducing redundancy. For example, 5 cutting tools, 5 lights, and 6 fire starting methods (over & above my EDC) seems high to me when everything is together. Likewise, having 2 complete stove/cooking systems seems overkill ... personally I'd be comfortable with the canteen based kit, but even going with the larger kit (and I'd likely go either alcohol or esbit, not both) would make the canteen system redundant.

I get the idea of being modular and being able to add & subtract capability easily, but I'd lean towards ensuring that what I'm adding is truly adding capability without adding that much redundancy. I might also look at not just adding but subtracting modules (e.g., maybe when the big cook kit goes in, the small comes out).
_________________________
Victory awaits him who has everything in order — luck, people call it. Defeat is certain for him who has neglected to take the necessary precautions in time; this is called bad luck. Roald Amundsen