@bigbossman yes, we are neighbors. I live where deerhill hits bollinger canyon (my son goes to twin creeks elementary).
Good points on going to the top of Mt Diablo, just keep in mind that morgan territory has hills that you'll need your legs on.
Clockwise is the way to go.
Water stops -
1. Mt diablo at the junction (before you start down the northgate) there is a water spigot behind the ranger hut
2. Downtown clayton - drinking fountains at the park next to the bathroom
3. Top of morgan territory - there is a park on your left as you finish the climb out. There are water fountains near the benches.
You should be good on water from that point on, if you need more there is are a bunch of little parks with water as come back into suburbia from highland.
Start early if possible (7-8 am) You'll avoid any cars at that point + you'll have a good chance of avoiding serious headwinds as you turn west if you can make it before 3.