CityWalk, easily. Downtown Disney is gigantic but for how big it is, has little things that are worth seeing/doing, IMO. CityWalk absolutely buries it in terms of places to eat as well. Margaritaville, Hard Rock Cafe, NBA City, Bubba Gumps, all awesome places to eat. I'm not big on shopping when I'm on vacation but if you were, I could see why you favor Downtown Disney.
Both offer great variety, but I like CityWalk.