Lol, Diesel can on average only be stored for 6 to 12 months before degrading. Good luck with that.
If a collapse ever happens I’d rather have solar panels and an EV. Fuel production and transport would instantly grind to a halt and the existing fuel goes bad soon after.
Mate, we are talking about a societal collapse. You won’t have oil available and you won’t be able to refine your own diesel at home (especially without energy).
Your argument about solar panels being difficult to produce is utterly out of place. Your diesel generator and your car are more difficult to produce, but you already own them from before the downfall. So if you own an EV and you own solar panels then it doesn’t matter how difficult those are to produce when you’re just using them.