For what it's worth, we recently moved locations (new fire and building approvals), and we had to modify 13 stainless steel single wall tanks with pressure release vents and sealed lid gaskets and lever rings, even while stored in our H3 (fire rated room), to comply with the spirit of NFPA. Plastic IBC totes are not usable for us at all upon landing at our facility, and we have full automatic fire suppression throughout the building. The 240 MAQ is in force for us anywhere outside the H3 storage room, which means 240 gallons of alcohol on the floor for us at any time, and its assumed that all tanks and distilling equipment are UL rated. Tank sizes did not matter in our situation. We had a issue with open vs. closed system in terms of distillation, but were able to keep the 240 MAQ with the open system, but they did initially want us to install a closed system (distillation directly to tank) vs. the open parrot into tank with open alcohol in the building, and threatened to drop our MAQ to 120 during that negotiation.
Oh, and we had to install an explosion proof fan in the H3 storage room with a direct vent to outside of the building (through the roof), and had to install and use near ceiling exhaust fans in the building when distilling/pumping/bottling, etc. And the ethanol detection system...
Good luck with the upgrades, sounds exciting!