I think once water containers are implemented, the current rate of hydration (for lack of a better word) will be pretty good how it is.

With food, if you go fishing, you will find some types of fish will almost completely restore your hunger meter. Berries cant be expected to take care of a big hunger, unless you eat lots of them. Just my 2 cents.