Having been acquainted with this issue for about 40 years..(not studied it in a professional capacity..just regular reading and thinking)...I believe that the only sane long-term solution to water rights and distrubution is to adopt strict land use policies, and by implication, population density restrictions.
This means gradually stopping and reducing settlement & agriculture in areas where sufficient water is not naturally available. Yes...this means Phoenix and Las Vegas cannot continue as in the past. Details would be difficult, but simple math tells you what will work.
*IF* desalinization can be added, it would ease the change, but obviously, it is no panacea.

It does seem like 1% of Great Lakes water is still a lot of buckets, and perhaps some minor distribution could be figured out and rationed, but IF you start selling it, there will be no end to whining about who gets it...(look at the Colorado River disputes!).

As a corollary of my opinion....it is ALWAYS the case that **population reduction** is the only long-term solution that fits almost any environmental argument. (Somehow, no one wants to face this one.)