I would replace the old Camillus with something more along the lines of a Victorinox or even just a decent one handed folder such as a Spyderco Salt etc. Have you thought about maybe adding a Photon or Inova microlight they are lite weight and can last for a very long time heck a gerber infinity even though it runs off a single AA instead of a cr123 will last forever off the one AA it's small and waterproof it doesnt create alot of light but you dont need it search buildings and stuff you need it to help illuminate a fairly small enclosed area. One question does the kit include waterproof sunblock, it helps to keep the skin oiled and prevent sunburn and would also might prevent salt water boils. I'd be intrested in seeing a detailed list of whats in the fishing kit and whats in the fist aid kit.