Ask HN:Can a CS guy survive in electronics work?
sophacles: Take the degree that provides you with material you wouldn't otherwise learn.  In your case, this would be electronics, because I strongly suspect you will pick up on the CS stuff on your own. My experience is similar to yours. I was enrolled in the CS program at a pretty big engineering school. I became somewhat disenchanted by it, as there were all sorts of interesting classes out there, but I only had free slots in my degree for 2.  In most of the CS courses I enjoyed the stuff, but frequently had already learned it on my own. So I switched majors to Geography. (Such a degree is nice, because it allows many random courses, so I could learn stuff I would have otherwise not learned).  I minored in CS and continued it as a hobby.  This has had no noticeable impact on my career, and I now work as a researcher at a university, writing and evaluating software.HTH