What is the context, what are the goals and main intentions for this land?
Yes! Look up some of Travis Johnson's
posts referencing this climate. He has an issue in VT with water
retention after increasing his organic matter and is a really robust resource, has done miles of earthworks and has learned some hard lessons. Know your climate and what it will likely look like if your plan works. Swales and terraces may not be the answer. I think Aljaz makes some good points! If you are basically planning on a silvopasture, which maximizes production of two strips (forage and trees), the shrubs are just a bonus. If you are as wet as Travis' posts indicate or will be after appropriate soil building, your erosion control may be water removal rather than retention. Most of us don't have that issue, so I don't feel very qualified, I would just be regurgitating Travis' info.
It's very DESTRUCITVE to have overall downslope pattern
I am using smaller fishscale swales because they are hard to screw up and they allow me some flexibility when I have better percolation. I am very happy with a 1 percent grade for small swales (including hugelswales which suck up huge water quantities but have some liabilities), but I understand that a long one would turn into a river with a measurable rain, and from Travis' posts if you have an erosion event, you are on bedrock quick. All of this comes back to the moisture levels.
Not every strategy is good or transferrable, mine is likely a terrible idea at your place with the available information. Not every strategy is permanently smart in a dynamic ecosystem. I work to minimize the possibility I make a 20 year headache (I'm sure somewhere on this place I will want to borrow a time machine). For instance, once I have shade cover from my tree strips, I will lose less to evaporation due to lower soil temperature, and may have to channel water. This has so many variables I haven't figured out how to predict it. Maybe my infiltration will improve at the same rate, but I don't know. It's fun!
Stacking functions is
Permaculture code for bonus points. This is true about the frost pockets and shrub/perennial layers and lots of stuff. It will drive you mad trying to get it perfect at the jump. Get the big stuff right- water, soil and sun. If you have to replant/cut down/move stuff- all part of the bargain. Honestly I have neglected my shrub layer entirely because I intend to steal/long-term borrow some of Travis' sheep and they would probably eat it anyhow.