Noone at our school does Econ and then AP Econ. Just do AP Econ in 12th grade. The kids at our school do AP Psychology - both my kids enjoyed it. Both are STEM and it was a better soc sciences course than the traditional history-type courses. They are required though to take AP/nonAP govt as a 1 semester class.