swales and layouts are all about the direction
water is moving. figure out the drainage directions of the
land, and set up "eyebrows" to trap the water and let it seep in.
Thats all there is to it.
If you have drying periods, you are better off burying the
wood, (in the bottom of trench, in front of the swales) or building pits, instead of piles.
That way, you trap and save the water and nutrients in the soil, where the
roots can use it.
Hugels (hills) are to give dry feet to stuff in dark forests, and wet soils.
The only other real planning should be height, and fruiting. You dont want to have to step on stuff to get to stuff in back too much, but a few footprints wont hurt good soil.
The real value of permaculture is in laziness. you are building towards a low maintenence tree scape, so think about that as you lay this all out.
Make it simple, and easy, and leave yourself a place to grow in it too...