I thik your son would enjoy WCC more. There are activities for him to participate in and a Lincoln Log building table in front of the restaurant if you have to wait. I really enjoyed the food too.l
Both times I've eaten at San Angel, the service has been so slow, It's so loud and dark and my kids hated it. It was torture and the food wasn't very good.