Nice list. Can't think of anything to add except one item. I'd think about a PLB of some sort and keep it in my pocket. I just can't put myself to trust the crew or other passengers to see me if I get tossed over the side, esp at night. Happened before. I don't know. Too much?

BTW, I have a surefire A2 also, with the blue LED. Best light I've ever had. Going to get a white/white when I get a little extra cash. You like it?

DLR