Air ships should use hydrogen. Helium is rare and expensive. The Hindenburg burned because of the aluminum powder mixed with iron oxide powder used for the paint on the
fabric skin. This is solid rocket fuel. Static electricity will not automatically ignite the hydrogen without available oxygen.
Yes, a modern airship... or even an old airship was not some big tank filled with hydrogen, it was a big structure that had gas bags inside it containing hydrogen or helium and you had way more bags than you kept filled all the time so you could shift the lifting force for balance and stability.
The point is that the space between these bags was filled with normal air so crew could move around and turn taps to shift the gas around etc.
On a modern airship that could all be remotely controlled so you could purge the air between the bags of lifting gas and just fill it with an inert cheap gas like nitrogen. Nitrogen is already 70 of the atmosphere anyway, so replacing the remaining 30% would mean you could throw a dozen burning road flares in there and rip open the hydrogen bags and there would be no fire, because there would be no oxygen for a fire.
A computer could have fuel cells hooked up to these hydrogen bags and water ballast tanks to change the lift and the ballast as needed to maintain level flight and to compensate as fuel is burned and also as loads are added and removed.
Helium is enormously expensive and is not as efficient as Hydrogen as a lifting gas so I would eliminate it from the design completely... it was only used because it is inert and does not burn readily in the atmosphere.
As you point out kvs, the material the Hindenberg was made of was rocket fuel/guncotton/smokeless powder type stuff... a real hint is the movie footage of the disaster.... hydrogen burns invisibly so those yellow flames is not the hydrogen burning... obviously it was burning too, but the real problem with the flammable skin materials and light aluminium structure didn't help. The air between the hydrogen bags would also have allowed the hydrogen to burn until the air was consumed.
With fuel cell technology you have the capacity to change hydrogen from a lifting gas to a ballast in the form of water and back again, with a reliable power supply. Solar power is free, but not reliable enough and batteries are still heavy so while it will carry them, a gas turbine engine or two or three that can be used efficiently.
Perhaps a small gas turbine to run the computers and keep the air conditioning systems going, a bigger turbine that can power the electric motors and everything else at once and a second big gas turbine as a backup.
While sitting on the ground you could use the small gas turbine together with any energy from the solar panels... you will need large numbers of fuel cells but they are compact and not that heavy. This will allow you to generate lift and use up ballast or reduce lift and generate ballast quickly as needed.
If you fly to a location to pick up a heavy load like a 100 ton engine of some sort, then it will take time to attach the payload securely... perhaps even a doughnut shaped airship with the payload in the centre. While it is being secured your computer can calculate ballast and lift requirements along with which hydrogen bags need to be filled and which water ballast tanks need to be filled or emptied to enable level flight. You might also have compressed hydrogen tanks for fuel supplies for the gas turbines so the burning of the hydrogen fuel does not effect the buoyancy so much.... heat from the gas turbines generating electricity can be directed into the main envelope with the hydrogen gas bags further improving their lifting capacity.
Burning hydrogen means no CO or CO2 emissions, and when operating at low altitudes a dehumidifier can be used to collect water ballast from the air... fly through clouds to boost its capacity to take on water... which can be fuel or lifting gas or ballast weight.