It's hard to tell from pictures, but I agree with Aaron - it does look like a water moccasin. Water snakes are usually thinner, lighter. I wouldn't mess with him if he shows up again.