Hey, good points. Yeah, education for much of the 20th century was designed to feed the economy. That's what you're describing. It was an education system that rose out of the Industrial Revolution. However...
Go back to the 1800s and late 1700s and you'll see more emphasis on citizenship, including critical thinking - although they used terms like "rhetoric" and "reason."
The Industrial Age changed a lof that, and then the political upheavals of the 20th century began to impact education. So by the time you get to the late 20th century, and American education essentially had multiple personality disorder. It was several different theories or approaches working at cross-purposes with our kids caught in the crossfire.
Now, in the 21st century, and the Social Reconstructionists largely have control. Or at least majority power.
That's how I see it. I could be wrong.