Well you asked for advice ... I would suggest switching to a CS degree because (1) you seem more interested in that than maths; and (2) it is a more 'useful' qualification given your aptitude.

You don't need a CS degree to be a good programmer, but given two good programmers one with a degree and one without, I would hire the one with the degree. Just like I prefer to go to dentists, doctors and lawyers who have good degrees and lots of experience.