Start teaching as early as possible. Cut the repetitive ICT courses too, and put teachers who know more than 'This is Word and how you open the internet' in the front of the class.

Also, there should be more extracurricular things that focus on CS. Maybe have a once-a-week meet-and-hack, or a hackathon every semester. We have something like FIRST Robotics here, so why not more of that? Just something to engage children more and provide more opportunities for them to discover CS in the classroom.