Modularizing your BOB stuff might be helpful. Its a little more prep work but it would allow you to re-adjust your gear in less time depending on the scenario.