I would take it one year at a time and not worry about the running out of math, just yet. He may be ready for full grade acceleration by then, or perhaps he could do a single year of independent study...but that is years away.

The "enrichment model" did not work well for either of my DYS and next year is the first year they will experience single subject acceleration. At this point, we feel it is absolutely needed.