Swales are good, but sometimes terraces are much easier to make if you have access to lots of organic matter. I’d look into “fishscale” swales too (aka pit swales, horseshoe swales), much easier to maintain weed-wise throughout the years. Hard to cut grass on terraces and swales. This is more of a larger scale concern though Id say