I suspect oil prices are going to collapse at some point in the next several years, once there are enough battery powered cars on the roads from Tesla and Nissan and others to reduce the demand for oil a bit. That may have some effect on the economics of organic vs not-organic farming.
Of course, that doesn't make organic farming pointless. Some people are willing to pay for quality. If organic farming reduces water consumption, there is also the issue that there are parts of the country that don't have unlimited water supplies, and I don't know of any plans to dramatically increase the water supply, other than perhaps there being a small decrease in corn farming as battery powered cars reduce the demand for ethanol to dilute gasoline with.