As for water, try mixing up whatever it is you're wanting in your water in a 2 or 3 quart pitcher, you know, the amount you need to drink in a day's time - separating it into individual 20-ounce bottles if need be.
At least that helps me to keep it going - and I can watch my progress to encourage me to get it all in.
As for the anxiety, I learned the hard way I wasn't getting enough omega three! I'm not a big fish eater and I developed severe anxiety which I learned can be associated with an omega3 deficiency.
I learned that a study was done and they found people with high anxiety (and also major depression) don't get enough omega three.
It made sense, because whenever I ate fish I felt better. I'm SO not a fish eater, but I made myself eat more simply because my body felt SO much better when I did!
I hope that helps. The fish worked so much better and quicker than the omega3 pills.
My fish of choice was usually tuna or sardines because a tin is a single serving and I could mix other stuff in it to make it more palatable.