I'll say cat but by a narrow margin. I love both, and I've had both as companions. I only like big dogs, cats don't really come in many sizes, and I've never had an exclusively-indoor pet, so I'm not sure how I feel about that question.
I love animals, though. If I had the space and the time and the money, I'd have at least one mammal living with me.