I just want to put in a word for standard microeconomic theory. If our water (or energy) use in aggregate suggests to the govt that our consumption needs to go down, then raise the price of water (or energy) across the board till it does.
Individuals can choose which of all your amazing water (and heat) savings ideas they feel would best suit them.