Take Computer Science definitely as that's the course u wanna pursue so you should take it now and this knowledge will help later on where others might be stuck and you're ahead of the game
As for further maths, do u want to take it and will u put the effort. If so, go for it .