I dunno, I guess I'll say cats..since there isn't a "both" option...simply because cats get really personal with you (imho) where dogs are more aloof.
I always see people say cats are distant and moody and don't respond to you..but every cat I've ever had has learned atleast 1 trick, loves to be on/near you whenever your around (regardless of if you are holding food or not), and comes when I call them (just like a dog).
Personally, I don't think alot of people give cats a fair shake...they are just as smart and friendly as dogs...you just have to work harder at it...just like with people.