From the videos, you dug all that hand?
That is an amazing amount of shovel work!
If your catch drains don't collect enough of the water from the down spouts, one option would be something to do something like we did for the barn.
View attachment 299836 View attachment 299837
The down spouts are four plastic chains that make a rain chain.
At the bottom of the chains are bolted to a rectangular piece of plastic.
Rocks are used to hold the plastic piece down.
The catch barrel is a 1/2 plastic mini barrel from Home Depot
A hole drilled into the bottom and a drain pipe connected to it.
The above was a compromise, as my original ideal, shown below, was vetoed.
View attachment 299838