the most acurate mechanical way is an excavator rental with a tilt wrist
bucket, next is a plain excavator, after that a bulldozer and lastly a backhoe. It's not that it can't be done with a tractor, it's just your going to take longer, be less accurate and more likely to mix topsoil with subsoil.
You can rent an excavator guy all you have to do is discuss and stress that it's an uncompacted contour
berm and he should know what your talking about n start asking why is it uncompacted if it's a contour berm. A trencher is way too narrow and your going to have to chase the dirt, I'm not sure what clips
geoff lawton has online for swales but if you'd like i could find some links to that and dam building with geoff just so you can see how the machine works the land when its being built.