Howdy Humble Janitor,
Good thinking w/ the DIY bag, that one looks like a temporary situation type of disaster kit. I think you're probably looking for something a bit more long term.
I've been keeping an eye on the
Bugout Bags thread in prep/advice, there's some interesting stuff there.
Macguyver has a pretty good OP that adresses some of your questions.
Best of luck w/ your bag.