I am in a similar situation with my DD that will be in 8th grade in the fall. She's been using TT for the past couple years, but midway through Pre-Algebra this year I realized she was retaining nothing and we switched to LOF for a while. While searching other options, I had her try some CLE samples and she really enjoyed it and for the first time didn't complain about math! To help make sure to fill any gaps before beginning 800 next year, I had her work through CLE's Math Development Skills sets. They have 3 available: Algebra; Geometry; Fractions, Ratios, and Proportions and they review material from 200-800. I had her skip all the 800 level sheets since it would be new material next year. You mentioned maybe even needing to review some of the 500 material, these booklets may be a good way to accelerate through some of that or at least pinpoint areas to work on. We've found them helpful as a review in general as well as to fill in holes to prepare for next year.