I'm a math major, but I've taken a fair amount of CS courses. The CS major can diverge into diverse range of sub-categories: Graphics, AI, Security, Theoretical CS(very math heavy), Software Design, etc. I'd have a look at those sorts of specialties, and see if you're interest lie within one of them, and If that's the case, I'd suggest going through a CS degree, as it is far more general than a Computer Engineering major. This generality in pedagogy also allows you to fairly easily switch between specialties if one doesn't suite you too well.