Dump the CD mirror and invest in a commercial unit with a correct sighting hole and mirror. How good is the matchsafe compass and whistle? Since your midway on a river voyage you should have a good idea of where you've been and are going. If you keep to the river attempting to walk out the compass merely needs to help keep you connected to the river if your land route takes you off track temporarilly. With the natural loud noise of various rapids etc.The whistle has got to be of good decible quality. Your Shrade is a good knife, but you need something to keep it sharp. A small flat diamond plate will take up a little room. One hi intensity lightstick limits your options in night illumination. I'd add a photon or similar minilight. I'd lose the hexamine and make up a small container of vaseline and cotton tinder. If your fishing the vaseline will help dope the improvised flies for your fishing, and I would add more safety pins. If I was walking a river a small container of DEET for the mosquitos and no see ums beats the mud on face scenario. Besides, you want a nice shiny face for searchers to spot.