Looks great. think the labels are very clear as to what they label.
I'd erase the lake boundary where the rivers enter and leave - it still looks like there are damns across the river entrances. Otherwise I'd leave it as is - it looks good to me. Nonetheless, your improvements sound interesting. I look forward to seeing the way this develops.