Electrical engineering vs. Computer engineering vs. Computer science
I initially got a degree in Electrical Engineering, and after getting my first job doing logic design, realized that a lot of what I was doing could be done by the new microprocessors just coming out (yes, this was some 40 years ago).  So I went back and got an MS in Computer Science and have never regretted it.

With the combination of a EE and CS degree, this set me up to work in embedded systems, which is what I have done my entire career (most of that as a self-employed consultant/contractor).

I'm not saying you have to get both degrees, but since you are already interested in electronics, I suggest that you pursue a degree in either Electrical Engineering or Computer Engineering.  In the latter case, your electronics education  will be pretty much limited to the computer and embedded design, which may be okay.  Make sure there are at least some courses in analog electronics (op amps, ADCs, DACs, and power supplies) you'd be surprised how much of a system is analog this days.  I don't think a degree just in Computer Science is a good fit for you.

Programmers without some formal background in electronics generally do not make good embedded engineers.  IMHO, it is a lot easier for a EE to pick up programming, than it is for a programmer to become proficient in hardware.