I think that's a great decision. I started out in engineering as I loved both the electrical and mechanical aspects of things. (Never stayed there because I loved the technical/hands on aspect as opposed to the theory). But if I were younger I'd be right there next to you in class for robotics. It's a terrific combination of skills and fun in my mind, as well as being a growth area if I've ever seen one.
I saw a really interesting interview with someone famous once (maybe Gates or Musk), who said that the best and most creative minds in robotics are in people who have come to it as a second career choice yet are passionate learners. His logic was that you need to be young enough to want to learn voraciously and continuously (programming languages and electronics), but experienced enough to understand mechanical limitations and that simplicity of design must drive autonomous engineering and repair.
He then made a joke and said that the ideal robotics worker was 1/3 Programmer, 1/3 Mechanical Engineer, 1/3 Electrical Engineer and 1/3 Laid Back. Then he said if can't spot the problem with this sentence, the industry isn't for you.