After you are clear on the laws and such, damming the finger by making a damn that is within your property line might be a good option as someone had suggested.
I would think that you would not need to make such a decision until after you met any new potential neighbors.
I wonder if your pond is being used as an advantage or buyer's attraction in the promotion for sale of the neighbor's land.