If you think water may help then try it - I never have personally - with DS we diluted and DD we cuddled to resettle.
Appetite wise - so variable. Both of mine are finger feeders apart from the odd yoghurt, and both pretty picky. Milk wise DD has 7/7/9oz but DS had 4/5/7 at the same age (and was STTN with that).