please see my suggestion for the fire extinguisher requirements. I have included the EE rooms for C02 and changed some of the C02 around the property to water as there is little risk of electrical combustion in the room. More likely to be caused be general waste and ignition.
Please note mine as per your list is only personal best practice and can be reviewed to suit the property best. I am not just trying to save cost by using water over C02, just thinking of installing where necessary.
I will give you back the pack you put together on Monday when I see you next if not before.