Oops. I messed up when posting the new drawing. I've added it to the post above.
Thanks for the tips, HoneyHole. If I can get the dirt guy back out before it rains again I'll try to put in some more tranches to the waterlines on both sides of the "U."