Ahem, yes, I'm a bit of an over planner.
Nothing wrong with "over planning", dude. There have been far more disasters averted with overplanning than with under planning. I'm an over planner, myself. However, I take the opposite view on achieving.
It sounds like you have taken the bull by the tail and squarely faced the situation. You'll be fine.
Regarding the fuel bottle, make sure the gasket it good, then put it in a double strip Zip Lock bag and locate it anywhere you want to. R
