Four years of foreign language?

For UCs (and CSUs) specifically, you already fulfill the (e) requirement listed in http://admission.universityofcalifornia.edu/freshman/requirements/a-g-requirements/index.html :

  • High school level 2 (level 3 recommended for UC): you have that for French.
  • SAT subject test: you have that for Spanish (520 minimum, you have 800).
  • AP test: you have that for Spanish (3 minimum, assuming you will get 4 or 5).

Some other colleges may prefer that you take a higher level of a non-native/heritage language, but you have to check those colleges individually. (Also, some of those which ask for SAT subject tests say that prefer them in subjects other than a native/heritage language, although you can still submit your Spanish score as an extra one beyond those that they want.)

However, some admission readers at some colleges may see AP statistics or psychology as a less rigorous choice than AP French.