Enjoy your night shift as much as you can. Don't know if you have problems staying up all night (especially night after night for an extended time frame) but, I've found a number of ways to help myself stay up at night and I have my own checklist now. It usually includes a new magazine of some sort in addition to a book. Sometimes, if I can't focus on a book, I can usually get through an article or two. Also, I like Skittles. I've found that eating them one Skittle at a time helps me stay awake. Lastly, and you've already got this one, liquids. I've found very few things help me stay awake as much as running to the men's room every 40-50 minutes.
Best of luck!