Permaculture is very clear on this matter - design the water systems / infrastructure first, measure swales, make all roads on contour, then put in structures! This is stuff we know, but of course, life intervenes and things don't always...