So you are going to fix the coastline to be high water mark everywhere?

What should I do to fix this? Should I detach the admin boundary from the coastline?

Whoops, didn't know that, I should probably undo that changeset then.

I couldn't see how to add an overlapping section to a relation in JOSM, so I split the way to create a little extra section. I also did this for the neighbouring wood.