Hi,
Thanks for writing. It sounds like you have a good plan. You might think about digging out some switchbacks or adding rocks to create switchbacks to help slow the flow of water. That can help the clay absorb better.
http://www.bhg.com/gardening/landscaping-projects/landscape-basics/slope-solutions/