On storage, something that worked for me: I got in touch with a local motorcycle racer I know, and got my hands on several 15 gallon metal fuel drums they didn't need any longer. They are metal (meaning easy to bond to the airplane) and seal up very well. I used them when I drained ~50 gallons out of my plane prior to fuel tank removal, and will just pump the fuel out of them back into the airplane when I'm ready to use it again. They also stack nicely.
There should be some car/motorcycle race clubs somewhere near you, get in touch with them and see if anyone has said containers. They aren't really worth anything once emptied of their magic go juice, and the drums are more economical for the racers so they are fairly common.
All advice here on bonding and static avoidance is crucial. I made a length of wire with a battery clip on each end, one for the drum and one for something metal on the airplane. I also grounded the airplane to earth ground (electrical conduit) figuring the self-service fuel pumps do it too, so why not. I didn't ground the plastic tubing (though I like the idea of metal in the line) but also made sure the ends were resting on the bottom of the containers. For transfer I used a GasTapper 12v fuel pump and just ran mogas through it when done to flush the 100LL out and protect the plastic bits. The plane was out of the hangar and I had multiple extinguishers nearby, though those cute little bottles won't really do shit for an open fuel fire, they are mostly to let you get away from it.
One other thing - limit the fuel available to burn. You can't ignite what isn't present. When I did mine, as soon as a drum was filled up I sealed it and moved it away from what I was doing. It may not save the airplane, but it can prevent a lot of collateral damage. Obviously if you are filling the wings up that becomes less possible as you go, but no sense having more in the vicinity than you actually need at the time.
Now, this isn't to say that you need to shut off every phone within 1000 yards and evacuate the facility. Fuel fires are rare for a reason, and fairly basic safety precautions will sort it out. You just need to apply them consistently and deliberately and you'll be fine. The simple fact that you asked and are trying to think it through means you will be fine with it.