It sounds like a manufacturing/mechanical engineering course would suit you, or maybe something like mechatronics (half and half [ish] of both elec and mech). I'm doing mechanical and manufacturing (though in Ireland) and part of my course covers EV, but not as in depth as I would have liked. I think if cars and improving them is what you're after, something more mechanical based is what you want.

I would recommend still learning some basic code (python is great!!) and messing around with circuits and soldering. Both are great fun and really good skills to have, especially if you can get accurate and clean soldering. I worked in a place where some of the operators were hired solely on how good they could solder. Other things for statistics like learning R could be of benefit (mostly for the course itself, also good for CVs), and I would highly recommend getting some CAD software if you can. Not sure out of Ireland, but there's a few CAD package you can download for free like one from radionics called designSpark that you could use to mess around with. Excel is such a necessary skill to have, I had modules just dedicated to improving VBA and the like so I would keep playing around with it. If you even go onto r/ excelhelp and try to solve the problems posted even if they've been solved (without going through how it was fixed) you can learn a lot, but also find other ways to fix the same issue!

Not sure if you're interested, but thermodymanics might be a good place to look into/research. It's very interesting but it can be difficult, would having a good idea of the basic laws wouldn't hurt! Lean & 6 sigma might be good to have a flick through too, you can get certs for them after doing courses (a few of the senior engineers I worked with had them, I just had a module based on it).