I was going to suggest CBT as well, but I see that has already been put out there.

It does sound like there is some difficulty with this particular teacher fit as well, though. Does he have any other options for teachers or is this it at this school?

Study Strategies for Accelerated Learners