You can solve the waste issue by rationing. But more to the point, prioritizing rich people is every bit as arbitrary as prioritizing those who live near water stockpiles.
You're 100% correct. Rationing by wealth leads to equal misery as rationing by who happened by the grocery store sooner. However rationing by wealth is the surest way to increase supply quickly.