I'm currently in my last year of computer science. This will be my second degree, the first being a B.A. in Philosophy. I definitely think that your on the right track with the comp.sci./math double major. However, like you, I find the comp.sci courses easy and, for the most part, really uninteresting. Not that the info. isn't useful, it has mostly to do with having to sit through lectures where the professors have been teaching the same courses for years now and are utterly bored with the material as well. Unfortunately, a degree seems to be the main currency with employers, despite the fact I don't think that a comp.sci. degree adequately prepares you for becoming a competent programmer.
Ultimately, I would recommend sticking with your program but pursuing your own programming and mathematical interests on the side (if you have time) in order to sustain and augment your enthusiasm for your future profession.
Best of luck.