I would recommend either taking the APWH test again or not reporting it when apply to colleges. What do you plan to major in? Other than that, this looks like a very good schedule.
Take courses that you are interested in and/or can do well in. Don’t take courses just for the sake of getting into college. Colleges know these “tricks” and will not be impressed.
For more opinions, post your schedule here: http://talk.collegeconfidential.com/high-school-life/1076336-rate-the-schedule-above-you.html#latest