"I can also assure you that, given that suspected battery fires have been at the heart of a number of cargo-aircraft accidents, there are a lot of resources going into figuring out how to contain and suppress such fires."
Thats easy. Just educate the people who sell the shipping about Lithium batteries.. Then all you have to do is design a packing method that is secure and educate the loaders to keep the things cool and out the sun. If you have ambients of 40C and direct sunlight these batteries will explode.
Once one of these batteries has gone off in a cargo hold...seriously..with more of them in the whole consignment..is there ANYTHING you can do? Switch off the air con...so the flight deck has clean air..apart from that..what else can you do? Land anywhere FAST..? The highway will do anywhere..but FAST.