I kinda am a prepper and your reasoning is definitely correct

Diesel is also good because you can make diesel from corn and stuff without crude oil

Gas is far worse than electric or diesel for post apocalyptic reliability