Demographic growth, changes in diet, and reliance on first-generation biofuels are increasing the human demand for agricultural products, thereby enhancing the human pressure on global freshwater resources. Recent research on the food-water nexus has highlighted how some major agricultural regions of the world lack the water resources required to sustain current growth trends in crop production. To meet the increasing need for agricultural commodities with limited water resources, the water use efficiency of the agricultural sector must be improved. In this regard, recent work indicates that the often overlooked strategy of changing the crop distribution within presently cultivated areas offers promise. Here we investigate the extent to which water in the United States could be saved while improving yields simply by replacing the existing crops with more suitable ones. We propose crop replacement criteria that achieve this goal while preserving crop diversity, economic value, nitrogen fixation, and food protein production. We find that in the United States, these criteria would greatly improve calorie (+46%) and protein (+34%) production and economic value (+208%), with 5% water savings with respect to the present crop distribution. Interestingly, greater water savings could be achieved in water-stressed agricultural regions of the US such as California (56% water savings), and other western states.