Your impression was correct about audience age.

In my limited experience, both shows are fairly good when it comes to this stuff. There's a strong supporting female character in the Diego show. The protagonists of both shows are independent and capable in ways that are much better (and more similar to each other) than you might expect from general kids' media.