Problems with neighbors & excessive water!?

I would talk to your neighbor and voice any concerns you may have with the current situation, he might surprise you and do everything he can to work it out with you. If not you should start doenting the water problem by taking photos of your property and his for a lawyer to look at. This is a civil matter that involves civil law so you will need a lawyer if things go bad. Good luck