If you end up w the AG, don't worry, she may not even like it. My dd loves baby dolls and I don't personally have any issues with them (other than the plastic). I bought her a cabbage patch, she doesn't like it nearly as much as the babies. Why? Too maturish of a doll vs the baby like baby dolls???
www.naturalfamilyboutique.com just started carrying some Waldorf dolls, yes expensive.
http://www.fannysplayhouseinc.com/
Look under Dolls, they even have dolls that are 'correct' below the diaper -- all cloth. I'd love to get a few of these, but my dd at age 18 mo already has 5 big doll babies and 5 hand held size dollies.
Under customer purchasing go to Kids and Grandkids sight -- they even have the correct dolls with mini-potties (ec sz potties).