And...see a lawyer. Neighbors are not allowed to channel their water onto your property. Only natural drainage is allowed in most jurisdictions. You probably should subcontract the drainage to a professional drainage firm. They have the trenching equipment and knowledge. Surveyer's transit. Laser leveling equipment.