I've been in your shoes too. Good for you stick up for your child. This is hard. I suggest looking into other options too, even if you are not ready to make a move now. It takes time to figure out a better move if you need it.

Also be careful about how much you push the teacher next year, because she can take it out on your child.

Get into Davidson ASAP and it might just work out that they talk to the school on your child's behalf in Sept. Also, consider have a Pschologist with gifted expertise present to the school DC's needs.