I'm going join those who've asked why both the Wave and the Clutch? I'm not as familiar with the Gerbers, so maybe I'm just unaware of a feature on it.
Also, why the book matches along with the ones in the case? If you want redundancy in fire making, put the mag block and matches in one case, and the lighter in the other.
Button compass, sparklight, maybe a better whistle? For about 35, 40 bucks including shipping? Depending on where you are, you might even be able to find the
Pocket Survival Kit locally to you. You might not need the other components, but they won't hurt to have either. With what you have, I'd almost suggest the PSP in your pocket with one of your multitools, then this on your LBE.