Hi Max
My cat is 13 and he still wakes me in annoying (but endearing!) ways, either by having a mad half hour around the bedroom, or by "combing" my hair with his claws-ouch!
Have read before that cats won't drink fresh tap water in a bowl because to them it smells very "chemical", but that doesn't equate with some cats fascination with a running tap, guess its all part of their contrariness! I gave up providing water years ago,Bruno always drinks from the pond, or dips his paw into my bedside glass of water, ok if I catch him at it, but the times I've taken a bleary swig and almost choked on a cat hair!