If I may make one more suggestion, Discrete Math is a good course to take if you can get one tailored more towards computer science majors.
In it (or, at least in mine) you can become familiar with several basic and useful data structures, algorithms, and how to evaluate the time complexity of a function, which you can use to determine how efficient its running time is. Useful if you like to try and squeeze as much performance out of your programs as you can.
AMD Opteron 185 Dual Core 2.6 Ghz | 2 GB RAM | 8800 GTS 640MB | Windows 7 Ultimate 64-bit