Yep, I too was an avid Aveeno user (I loooooved the smell!!) but when I started getting conscious about product's ingredients, well I realized Aveeno was no better than regular Johnson's. Sucks really cause I thought the Aveeno line was "good for baby" and I felt duped.
I now use a bit of Burt's wash on dd (on smelly neck areas), mostly water for ds. Even Burt's isn't all natural, "fragrance" is listed on their ingredient list, which is toxic as well.