Yup, tea can count as your water! So, how much do you think you drink a day? It's never good to gulp, so definitely don't do that. But, you can sip on water and tea all day long. I usually have both going on at my desk at work. The warmth from the tea is good for helping to relax the muscles and ease pain, as well as the natural antispasmodic in peppermint. Not sure if you can drink that or not, but chamomille is a nice alternative.
I've never done a food journal myself, but since you weren't finding any answers, I thought that may help you figure something out. I don't know if there is a right or wrong way, but someone who has already done one may have some tips for ya. (Anyone? )
I try to drink a lot of water/tea though. I take a bottle water to work in the am, and I have to drink it by the time I get to work (it's a 20-30 min ride). Same with on the way home. Plus all I drink in between.
That plus exercise, and upping my insoluble intake usually helps me get things moving when they get stuck. I've never been as severe as you though. I hope you can find a solution.