One thing missing on your list is medical self-sufficiency. A real tough one, unless you live in a commune staffed with ex-ER and pharmacy personnel, and associated matériel. I hope at least your well pump runs on solar or another alternative source. Grid power will be subject to easy sabotage.
Yes. A generator and gasoline storage will be good things to look at if the collapse snowballs.
As far as medical is concerned, I have two sisters-in-law and a niece who are nurses.
Hope that’ll be good enough. We’re pretty healthy anyway.