Thanks for the advice.
I added an additional 1L bottle which brings my capacity to 4L including the 2L Sawyer bag. And that is good to know for the JMT.
"I take it then you have not done to much hiking in your rain shell? On my CT thru this summer, I plan to only be in my rain jacket (OR Helium II) when it is actually raining. Otherwise, if it is cold and/or windy I'll be in my Houdini.
I once thought I could do the rain shell only, but once I tried a wind shirt I was a convert. I know, I sound like a broken record, but it's true."
---> I have not hiked in my current shell, but have in many others before. I have a Lukesultralite Sil shell with pit zips added. My logic has been if its raining hard Ill wear the rain shell and continue to hike and if it wets out then I will still be warm so I dont really care. And I guess I had not considered taking the wind shirt for anything other than light showers, but it would be a great hiking layer. I usually dont add additional layers to hike in because I have found that the only times I use them are the first half hour or so of hiking in the morning to warm up, and in that case I can use my rain shell... just a thought. Although it would be nice to have for summit days, around town etc. so who knows maybe ill throw it in the pack, it is afterall lighter than my 11 oz hoody I usually take to serve as that mid-layer warmth garment.
P.S. I updated the list in my original response to add the things y'all have suggested. Thanks for the help. Hopefully this is saving me from some uncomfortable times on the trail!