Figtree is right about the wire saw, most won't hold up. In small kits I replaced all the matches with 2"x1/8" ferrocerium rods. Doug Ritter's PSP is good, no matches, no cheap saw, but good signaling gear which is much more important to the guy who gets lost.

Also, check out the EDC kit at CountyComm and consider an EDC kit that looks more like a set of keys. I like kits that I can use every day. It makes it easier to remember what I have if I use it, rather than having it stashed for emergency only use.