And the cliff side parts all have street holes.

So it is unpossible to build a dam near rocks and with a upper water level like this (photo montage):

I suggest new dam blocks:
cliff sides with dam without street tunnels, and a damn block that fits between the low cliff and water on the regular surface.
The upper side could looke like here (real dam, Krishnagiri Reservoir, Tamil Nadu, India):
