I am reposting this with a different title, to make searching for it easier.
Concerning the main trail, look at this: Main Trail water
. There are quite a few additional water sources up there, but these are the best of them. Pictures, so you can see what the scene looks like as you are passing by on the trail, are here: Main Trail water pictures
. The location numbers in the writeup and the picture numbers are consistent.
Similarly, for the North Fork Mountaineer's Route: North Fork water
. And pictures: North Fork water pictures.
A larger version of the map is here.