I believe both of you have the right idea. I also have a water filter that I can use to filter creek or river water to make it drinkable. It only filters about one quart per minute, but I'm a patient person.
I also try to keep at least 25 gallons of diesel fuel in "jerry" cans. About every three months, I refill my truck's tank from the cans, and then take the cans to the station and refill them. I also keep a spare 30 pound tank of propane in my camper trailer.
One of the most important things, IMHO, is if you take prescription medicine, keep a 90 day supply on hand at all times!!!
Also, if you're on good terms with your family doctor, talk to him about emergency situations, and ask him if there are prescripion medicines that you should have in your first aid kit.
If he knows you to be a cautious and reasonable person, and you let him know that anything he TRUSTS you with will be used ONLY for absolute emergencies when professional medical help is impossible to obtain, he may be willing to give you a small supply of some of these for emergency use.
(Hint: You might ask for a painkiller stronger than aspirin, but DON'T ask him for half a kilo of morphine!)