Here's the new design. What do you think?
Some notes on the canals:

1.Canal 1 flows into atajado 1
2.Canal 2 flows into canal 1
3.Canal 3 flows into canal 1
4.Canal 4 flows into atajado 1
5.Canal 5 flows into atajado 2
6.Canal 6 flows into canal 5

7.Canal 7 flows into atajado 3 and then leaves atajado 3 and flows into atajado 2- this collects water from the area above the existing atajados (the grass/grains/legumes area) and stores it in atajado 2 in the productive infrastructure area. Atajado 3 is optional, but would allow for more convenient irrigation of the fruit trees.

8.Canal 8 flows to the ram pump site at the galleria to be pumped to atajado 2. This is the only way I can see to get water from lower down in the silvopastoral area to the other side of the gulley without building another atajado. Depending on how much water there might be, this canal is also optional. If there is a lot of water, it might also be possible to build another storage tank at that sight for irrigation of the fruit trees (or move atajado 2 to a lower elevation spot).

9.Canal 9 collects any extra water not used by the fruit trees, and runoff during the rainy season and brings it to the ram pump site for storage in the ferrocement tank. Again, this depends on whether or not you there is enough water to warrant building the canal.