How about a grid system that changes direction at every single avenue?

Speaking as someone who has been living in towns with rivers for most of my life:

This is the way.

My experience clearly says that you will loose orientation and get confused the moment you go to a district that is not alligned with the riverbank.