I think we need to change things drastically.

De-emphasize calculation and fact regurgitation- machines can do that better and they are ubiquitous

Emphasize critical thinking X100- so we can discern good from bad with more accuracy

Emphasize Arts and Communication skills- so we can work better in social environments

Emphasize Social Skills and Psychology- so we can understand our own motivations and those of others

Learn the basics of rhetoric, so that one can tell when others are using rhetorical tricks to manipulate others.