I would do away with the whistle, redundant since you have the Fox 40, pack it in a waterproof case like this one:
http://www.rei.com/product/723130/witz-keep-it-clear-sport-case

I would find a single AAA flashlight that is waterproof instead of the Innova (which seem to fail easily) and I would replace the cord with some of this:
http://www.bestglide.com/milspec_paracord_type_1a.html

This cord has inner strands that can be used or left intact for 100 Lb test.

I would add a small fishing kit like this:
http://www.bestglide.com/compact_emergency_fishing_kit.html

Also, try to get that mini-Bic in there. Soak the cotton balls in Vaseline or get some TinderQuik tabs.
_________________________
No, I am not Bear Grylls, but I stayed at a Holiday Inn Express last night and Bear was there too!