The shocker is that milk has lost half of its market globally. That is unfortunate and i suspect largely due to what has happened in terms of industrialized dairy farms. This must eventually drive a proper organic, grass fed dairy suppling raw milk. Yet that is some ways off and really needs a technology work up to allow transition.
Raw milk can compete and fermented milk products do eliminate the sugars. I do see a day in which multiple large herbivores will become milk sources as all have a history. Moose milk should be significant.
However, i also think that nut trees need to be also integrated into all large grain fields in the form of widely spaced fence rows that are essentially two swathes wide. This provides a natural leaf cover to the stubble field and supplies nutrients from deep down. It may represent five net acres per hundred but the improved fertility could well improve the grain yield and assist in water management as well.
All this without actually disturbing harvesting technology and strongly supporting a shift to organic methods. We are all mentally locked into perfect large mono-culture fields and that is actually a mistake never totally allowed in nature.