I think we need to break all of this down into at least three entirely separate areas:

1) Computer Science, which is, in my opinion, entirely a subset of mathematics, and should be taught as such.

2) Coding, which is the ability to break a problem down and describe it in a series of simple steps.

3) Craft and application, which is everything about how to use tools, best practices for code architecture, and everything else that every new graduate is usually terrible at.

I think we could satisfy most of the world's need for "programmers" by teaching #2 and #3 in a trade school model.