I ran into exactly the same problem in 1st and 2nd. We have reached something of a solution in 3rd. He had been doing Singapore math, but in 2nd the school district offered a group rate through the District for EPGY. I got the run around at the second conference in 2nd grade, so I called the Principal for an appointment. I was able to show her the math DS was doing, printed report from EPGY which is used by the District for gifted children 5th and up. She agreed that he would have advanced math. He does EPGY in class and after school care and works on advanced sections with two other children in class.
One thing I didn't push math facts. I let him fill out times table sheets to help complete problems faster. When his class started to work on math facts this year, suddenly he knew them better than anyone.
