Also, In building your nutritious diet, you have to consider the proteins and essential fatty acids. Wheat and Beans, for example make a complete protein, you can get by with a ratio that is more wheat than beans.
Likewise, you can get by with a small amount of meat and add the beans or legumes. So to some extent you can vary these based on your preferences. If you store more meat and beans, you might get by with a little less wheat.
I can understand that you do not want to have to move so much stuff, but that is a decision you will have to make depending on how long you realistically think it will be before the SHTF/incident you are preparing for takes.
I think we will have better luck next year, because we will be better prepared and better organized. I am planting shorter day varieties so that the spring planting can yield a harvest earlier before the worst of the summer drought arrives. Also will do the same for fall planting.
In addition we have increased our storage water potential by 4000 gallons, so that will help the gardens and our water supply for emergencies/long term preps.