Computer programming should be offered as an AP similar to how AP Statistics is in high school. I ran out of math to take in High School - the logic of calc-based psychics and advanced calculus trend well with object-oriented programming.
Maybe not the ideal choice of languages, but nonetheless, I did feel much better prepared than my peers when I started taking programming courses in college.