RD, definitely do as squirrel suggests and get on a HUET course -if possible get them to allow you to use your HEED bottle as well. I have just completed my 2 yearly Huet/STASS (same as HEEDS) training in the dunker and it is still valuable even after doing it for the last 20 years. As someone pointed out (squirrel again I think) if you can't get out then all the survival kit in the world is useless. Being underwater in a helicopter is very disorientating and it is easy to get stuck - the latest statistics suggest that 65% of people die needlessly in a helicopter ditching, it's not the impact that kills them just lack of training!
As for the rest of your kit - very nice indeed, if only the military thought the way you do!