imho Chihiro' s innocent. Sure, he could've told Madoka earlier that grandma's coming, but its not like that would solve the whole baggage between Madoka and granny. And even if he's very mature for his age, Chihiro still a kid.
On the other hand, neither granny and Madoka tell him anything...