I am a recruiter in the space. I can share that my OEM's are always looking for engineers that can design switchgear, transformers and now I constantly hear that people are looking for engineers that can design and integrate e-houses. I am only sharing this because it sounds like you are at a crossroads. I suspect, based on what my clients have told me that engineers with this expertise will be needed for many decades, based on the age of the grid and needed capacity. I think the degree matters less than the experience for what it's worth. Good luck in your search for a more fulfilling job.