I found it easier to get my 8 glasses in when I make some of them herbal tea. I make up a pitcher of mint tea, add the juice of 1/2 lemon and leave it in the frig. I like it poured over crushed ice during these hot summer afternoons.
After dinner, I often make blueberry tea or something similar. Fruit-flavored tea in the evening has been a big help marking the end of eating for the day and replacing dessert after dinner.