Cats like their water bowls separated from their food bowls. So, I would do that, to start. Cats like large bowls of water, filled very high. They don't like to dip their faces into a bowl to drink. I would get another fountain, and put it in an open and safe place. I would leave the tub to drip, and the faucet, too. I would add water to his wet food in the am and pm, so that he ends up drinking more while he is eating...