Yes, this drinking from the tap is a great trick, but most of my cats don't learn it, even when I show them how. Some, however, seem born with the art. I often set the bathroom sink tap just barely closed, so it doesn't drip really, but it forms a kind of siphon effect like you get from those nice hamster or gerbil water dispensers. I have seen them now in a few pet shops here in large sizes for cats. One thing I do for all the kittens that come into my home is wash them several times in the bathroom sink during the first month or so. They grow up never fearing a bath, which makes things like dripping water, the lawn sprinklers, or falling in the bath or toilet funny rather than frightening. If you really need to clean their fur of some kind of noxious substances they have picked up in the street, you can do it without being clawed to death.
As for sleeping in the food dish, is there some reason why the cat shouldn't? At some point, it will outgrow the dish, and then it will find more adult sleeping places. Is it perhaps looking for a box to sleep in to make it feel more secure? Many cats crave baskets or small carry-boxes when they are young, so I make them a little nest of towels or old sweaters in old laundry baskets or carry boxes with the doors removed, and they seem very happy to sleep in them.
Put the cat down to sleep in several of these optional spots -- try positioning the box or basket near you at night. I would bet it fills the need for security.