I noticed that the size of the vial of matches was a concern for you. Have you considered REI Stormproof matches? The matches are windproof and waterproof and have twice the incendiary material of the NATO Lifeboat Matches (I think that is what is in your vial). As a result they are a bit bigger, but you could ditch the vial since they are already waterproof and the incendiary material is orange so you should be able to spot them easily. Each box also includes two separate striker strips (in addition to the striker strip on the box). The striker strips can be cut down to size to fit your kit.

Jeez, you would think I invented these things the way I am gushing, but they really are top notch.