I would take APUSH junior year and Comp Gov senior year. Many/most schools expect a year of US History. This, for example, is from the UC a-g list of requirements:
History/social science (“a”) – Two years, including one year of world history, cultures and historical geography and one year of U.S. history, or one-half year of U.S. history and one-half year of American government or civics.