I think you are exactly right - aeh! You have obviously given this a lot of thought as well as having personal/family experiences. With the changes in our school district, DS will need to take one or two math courses either at the community college or another college during high school. Unfortunately, our district does not accept AoPS credit, otherwise DS could take their courses on Olympiad Geometry or Group Theory after Calculus.