Firstly, I think the waterflow direction is incorrect per your reply and the now closed https://www.openstreetmap.org/note/4339350

Will have to think about how to map the overflow at the dam damming Surrey Water in order to avoid any future confusion about how the water flows here

https://www.openstreetmap.org/way/141394271