Good mapping! I've just validated this, all looks good.

Hi John - thanks for your edits! I just noticed that in this changeset, there are two bodies of water which are marked with water=* tags, but they also need to be marked with natural=water. I have made this change myself now, so no worries, just letting you know.