You guys have a bit of a dilemma, unless you figure out a way to do both, you must decide if it's better to support the student learning through a spiral approach? Or to support the students ability to amass AP credits? Unfortunately, I suspect that many administrators will choose that which will improve their performance metric numbers.
If we change to teach AP physics 1 and then AP physics 2, we lose the spiral. Also, students who only want one year of high school physics lose their survey. Not sure what we are going to do yet...