Suggestions on this dispute with my neighbor?

Reading your post, this came to mind:

a-c-a-b posted...

Would it be an option to use a plastic barrel to gather the water and then use a hose to drain it when needed?

Also, have you considered a french drain ?