Yeah, I left out some stuff. Everything you mentioned I carry too, as should everybody.
I don't carry plain water anymore though. I buy a product made by Wilderness Athlete called Hydrate & Recover, and mix it with water. It works much better for me than plain water. Taste good too.