Going electric makes more sense IMHO.

You don't have to deal with the oil supply chain that has issues, from geopolitics, wars, environmental disasters, gas stations. Instead you just slowly upgrade the electrical grid and add more renewable energy production.

If I had to bet, refuelling a car will be a challenge once it will not be economical to have many gas stations everywhere. Fossil car will still exist like we still have horse carriages. I do enjoy the sound of an old internal combustion engine, in some contexts.

Not to mention that hybrid cars are bad electric cars that are more expensive and heavier. Once you have an electric power-train and a battery, it's not much more expensive to have more cells and get rid of the old heavy fossil tech.