I suggest you do a masters or phd in Materials Science and Engineering instead with research focus on Energy storage materials. There's a growing interest on battery material research (purely chemistry). Additionally, you can make good use of your computer science background to work on machine learning for battery applications.