Just thought about a possibility for your drainage issues.
We had a lot of concrete work done around our home, and as part of that work, they did some drainage work. I believe some/most concrete guys do deal with drainage.
We used Albert for our concrete and cannot recommend him highly enough. Of all the contractors we’ve dealt with, he’s got to be one of the most efficient, professional, honest contractors out there. He was a total pleasure to work with — always on time, did everything exactly as he said he would, and came in at exactly his bid price. He does quality work, too. We plan to use him at some point in the future for more concrete/drainage work.