Yes, I don't think I'm getting all the water I need, it just takes so long to drink water-I would have to be drinking all the time to even get close. As for the protein-I found this great Protein Whey Isolate called Nectar, doesn't taste like a protein drink at all. I got mine online and at a local store call The Vitamin Shoppe-they had lots of flavors; Lemonade, Iced Tea, Twisted cherry which tastes like watered down gatorade.
Good Luck