Great, I'm glad I could help!

You raise a good point about discrete math, let me add the following to my list above:

* MIT's 6.042 ("Mathematics for Computer Science") Lecture Notes start at first principles and go on to cover relevant discrete math topics motivated by common types of computer science problems.

http://ocw.mit.edu/courses/electrical-engineering-and-comput...