You don't have to work in something you don't like. Work should be about pursuit of personal fulfilment with no economic factors forcing you to pick something you don't want to. With massive strives in automation, there will soon come a point where industrial workers (for example) are not necessary. They should be allowed to pursue their passions and drives to improve themselves and their community free from coercion.
OP your definition of Socialism is closer to the definition of Communism. Socialism still allows for private ownership and the existence of capitalism. Communism doesn't.
Sorry for the argument ad dictionary, but: "a political and economic theory of social organization which advocates that the means of production, distribution, and exchange should be owned or regulated by the community as a whole".
If you think that can be brought about by democratic elections and political reform: democratic socialist.
If you think mass revolution orchestrated and sustained by a vanguard party: authoritarian socialist.
If you think the vanguard party will replicate the same dynamics of capitalism and lead to further oppression: libertarian socialist (anarchy baby).
There are a million different labels that blur these positions, but I'd say they're the fundamental three pillars.