I just added a MOLLE sheath to the strap of my Jumbo, so its right in front of my if I need it. I also have that light and clip it so it faces out.
I tried the sheath mounted on the strap for awhile, but the weight of a Surge on the strap felt a bit odd.
Would like to see some pics of your rig!
I will try and throw some up tonight. My Jumbo is my DSLR bag, so not a lot of EDC items per se in there, but it doubles as an EDC bag in a pinch.