I'll tell you what I would do, Kartographer surely might do differently.
Right now, I'd put half or more of the storage at BO location. Then, if SHTF, right then I'd take the rest and head for BO location and stay there (instead of house), to see what happened.
I wouldn't stay at the house at all if SHTF because you might not be able to get to BO location later and having water at BO location makes it the place to be fast. You are taking a gamble on water if you stay at house. I wouldn't do that.
Marcella is right, you need to stock your BOL. You don’t know how much time you have to bug out and like always you will forget things! Also make sure of your route to your BOL and look for ‘pinch points’ and ways around them! And don’t just map them out DRIVE them. Maps don’t always show all!