If you are located in Northern Virgina, I recommend you consult the Northern VA Soil and water conservation district. They will come out, assess the site, and give you recommendations of what you can do. Then you contact a contractor. If you use one of their recommended methods, you can qualify for up to $5,000 to use towards the project.

https://www.fairfaxcounty.gov/soil-water-conservation/about-soil-water-conservation-district

Thanks - Custom Drainage looks great but they don't service Montgomery County where I live.

You need a landscape designer or civil engineer. Landscape designers deal with a lot of site stuff - handicap ramps, curbs, road speed and turns, etc...

If you are in Virginia I highly recommend Matt Miller. This is his specialty. Custom Drainage Systems. He provided a very thorough free inspection and did excellent foundation grading and downspout work for a fair price. http://www.customdrainage.com/about.html

If it's small, just DIY, since it won't require any construction equipment.

I'm looking for a contractor who can advise/construct mitigation for water runoff in our yard. I have a very small yard that just gets swept away whenever there's a major rainstorm.