Exact same situation. I'm switching majors.

Edit: Another thought: Computer Science is boring as hell. Even the tiniest bit of ADD makes it impossible. Even a person without ADD will probably show some symptoms of it. Rather than figuring out ways to just "get through it", I think avoiding this situation altogether is a better solution.