Water runoff problem with my neighbor?

I would try to work it out with him first. And you should work it out with him since he IS at fault. If he does nothing about it or to fix the problem you contact your local city hall and ask what the proper procedure is. Most the time they will come out and inspect the damage and send him a citation to fix the issue.