I have the same backpack and many of the same items and several of the same needed upgrades.

Instead of having so many Nalgene bottles, I use a 2 liter hydradration bag since your pack is hydration compatable.

I would also go with a small headlamp such as the Atom which only costs around $10 and is so light that you will forget you have it on.(rather embarassing) The Atom provides plenty of light for around the camp and I have had mine for several years and am still using the original battery.