Thanks everybody for the inputs!
A couple things I forgot to mention is that I always have a small lighter in my pocket, a small Gerber folding knife on my keys, and I keep a fresnel lens in my wallet. I will upgrade the needle and will add a small mirror and some printed survival instructions (along with some knot tying instructions).
Those Benadryl strips are a great idea. I'm going to have to look into getting some.
The first aid kit is an AMK that I picked up from the BX. I really like how compact it is.