Great article Nem, much appreciated, I to had a mega sort out plus changed from a Bug Out Bag setup to a Get Home Bag setup, My pack is now far smaller ( quite similar to yours actually) and much more modular with assorted module I can pack or disregard needed.
I base my GHB around a KOMBAT UK NAVBAG.
http://www.kombatuk.com/view.php?ViewProduct=901
It can be used as a back pack it has shoulder straps that pack away inside, it can be used as a Messenger bag with a single strap or carried as an attache case by its handles.
Because of limited funds and because I dont travel that far from home I use two 500 mil SIG bottles for water and my assorted bits n bobs are in sealed tupperware type containers, cos they are cheaper than those natty pouches you have
Fire lighting is done via 3 BIC lighters or my lovely BLAZER PB 207 butane torch which has never failed in 20 years, I love it I can light fires, solder or even braze with it ( badly)