Totally! Everything which only requires knowledge and routine processes is going to gradually be shifted onto computer programs, putting problem solving and creativity at a premium in humans.
A complementary axis will be collaboration: two problem-solving minds collaborating are much more powerful than when they each work alone. And I think we could improve the education system to better explain the "science" of getting people to work together and collaborate.
100% Agree!