I am 18 days out and i've been having the same issues. In fact i was becoming undernurished and my nutritionist told me to start drinking smoothies made with greek yogurt, fairlife milk, and fruit. All Protein is disgusting to me except the Atkins Carmel Cafe shakes, and those have a lot of fat in them, so I was told to limit them to once a day.
As far as Water I was only gettng about 24 oz in.. So my NUT told me to add fruit slices(just dont eat the fruit) So i've been adding lemon and orange slices to my water. Since surgery I cannot tolerate crystal light. I've also made a batch of the Starbucks Tazo Passion Fruit Iced Tea and I mix in the MInute Maid light 5 calorie lemonade and it helps get fluids in also.
I'm currently choking down an Isopure Zero Carb-- at the very least it helps me get my water in, because for every drink I take I have to chase it with water.