Just updating this thread, as all of your input as been so helpful. My DS7 did move from the first grade math to the more advanced 3rd grade math classroom this year for the second semester. It's gone really well and he loves math again. Once he was officially enrolled in the 3rd grade math class, he was given the MAP-M (instead of MAP-P) for the spring assessment. His score dropped considerably, which we anticipated since a 246 on MAP-P seemed highly unlikely for a six year old. He scored a 225 on the spring Map-M and will be going into a compacted 4/5 math class next year. Taking things year by year, but at least right now it seems to be a good fit. :-) Thank you to everyone who encouraged me to really push for him to take the MAP-M instead of the MAP-P, I think it gives everyone a better picture of where he is.