Hacksaw, I kind of think the way you are with my BOB, because I really do not see any other way. If I had a BOB with enough water and food for a week, living minimally, there would be nothing in my BOB but food and water.
I've got a bug-in supply of food that would last about a month and water for a number of days. Wish I had more of each, especially the water, but there is only so much one can do with an apartment. With a few minutes to preapre, I can quickly increase the water stored.
However, I do have a few days supply of food and some water in my BOB. I think the burden of carrying some of it is worth more than the risk of being without it.
And as far as OBG's comments on rain gear, I'd add a tarp. Both DW's and my BOB have a tarp and a drop cloth. If I remember correctly from this winter, your sleeping set up is pretty good, but wet would compromise almost any set up.