I do NOT think AoPS Algebra is a companion to the PRE-algebra course. AoPS has divided into 2 courses so Algebra 1 should be companion to Algebra 1. AoPS also has number theory and counting/probability.