Caffeine is enough for me. I know its not great to feel you "need" but its part ritual at this point. During the work week I get away with a cup or two in the morning, not one of those all day coffee drinkers. And it has to be good coffee.. I prefer my own and make it with a french press and drink it black.
I really only drink water or seltzer (outside of beer/wine)... and have gotten much better about hydrating during the activities. Also have some new bars I like.. they are baked, wheat free, lots of fiber and decent amount of protein.