I like that you address this. I would add that the problem is not agriculture per se, but the ‘freedom’ agriculture allowed people to have by providing food that was too cheap, and hence the disconnection from natural consequences/rewards that civilization allows (a wall between civilians and reality). One oversimplified solution is to raise the cost of food until people are forced to apply some significant part of their activities toward natural existence (to pay or produce food themselves) (as well as parity for farmers). At first glance, this seems horrible to poor people, but in a general sense, people are kept poor and disconnected from the land in order to compete over jobs, not existence.
Somewhere between people having power to provide for themselves with their own hands (hunter-gatherers) and people being enslaved to an agriculture commodity system lies a world where people appreciate and limit their dependencies rather than creating new ones (robot farms growing protein powders).