Reading the really well written OP, I compliment
@Ammara Chaudhry 's efforts and intentions. I am not muslim and I do share the popular view that sharia is completely inapproprite for the modern world we live in; but one has to appreciate noble intent when one sees it. Whether divine or man-made all codes of behavior enshrined in laws are intended for ensuring social harmony; when such laws are made part of religions, then you end up with interpretations and mis-interpretations. That is what has happened to all the greatest of codes of law - whether Hindu or Islamic or whatever else.
I do have a question for
@Ammara Chaudhry : why is it called 'way to the water'? and from the language you have quoted I can see it only applies to people in yatrib/mecca - so why and what makes muslims mis-interpret it as applicable to elsewhere?