[turtleyacht]

Have you considered mechatronics? There may be some curricular differences among mechatronics, EE, and mechanical engineering to consider, especially coming from a software development background.

How's your interest in embedded and robotics, versus thermodynamics and stress of materials?

What about the electrochemistry of wafers and ultraviolet lithography, versus circuit simulation and logic gates?