Your soil is very clay dense which is why water won't soak in and anytime you smell soil with a "manure" odor, it is anaerobic and that has to change, drainage is good but it isn't going to actually fix the problem.
To get to my soil threads, just go to the soil forum in Growies, the link is at the top.
You are going to need to get 1. lots of woodchips and
compost into that soil to open up the structure, at this point I do not recommend any sand be added since without a lot of organic matter opening up the soil, adding sand just makes
concrete.
Once you get lots of cover crops growing and using chop and drop methods along with the top dressings of quickly decomposing organic matter, you will be on the road to being able to add some sand to further loosen the soil structure.
for now you might want to dig some wide, shallow drainage ditches that lead to the main drainage you show in your fantastic photo. (great
job of showing us what you have)
Redhawk