The big fix here is the Retaw Llim. I didn't realize that the "Must be next to [Fresh water]" unique covers all rivers as well as lakes and oases. So, keeping the unique that way lets you build the Retaw Llim everywhere the Water Mill can be built and everywhere the Floating Gardens can be built, without letting you build it just anywhere.