Great that you have a plan!
If I may: when designing, following an order is important. One I like to follow is the scale of permanence by Yeomans:
Climate: it is as it is, cannot plant bananas in NorwayLandform: map slopes and drainage.Water: place reservoirs, ponds, swales, irrigation infrastructure.Access: locate roads and pathways where they won't interfere with water flow.Trees: establish windbreaks and agroforestry belts, as well as shadeStructures: place house, sheds, animal facilities.Subdivision: create paddocks and production zones.Soils: improve with compost, manure, cover crops.Economy: optimize crop and livestock enterprises.
As for you, the subdivision and house is already set, this order won't work for you. But mapping the slopes and the drainages appears quite important to me. Do you know in each square meter where the water flows when it rains? If you draw this on your map, it helps you design the water harvesting structures, and keep more water in the land. Maybe you can even benefit from water from somewhere else?