Well, if it turns out to be so hard to extend the list of "ways people make a living" beyond the two items {entrepreneur, worker under management hierarchy} that would constitute support for the "brainwashing" hypothesis (overstated as the term may seem).

When I was younger I wanted to become a novelist and make a living that way. That seems different enough from entrepreneurship; it's one of the passive income categories. (My parents discouraged that - "you need a real job".) Another classic one is to be a landlord. Silas mentioned investment income earlier, that could be considered a separate category. You could also consider as a different category someone whose intellectual or artistic output doesn't generate royalties but who is supported by patronage.

To maintain that "the educational system hasn't kept up" we would have to believe in the first place that it was at one point designed to turn out a then-optimal balance of people trained in one or another way of supporting themselves. I'm not sure we have good reason to think that.