The copy of Grimm's Fairy Tales that I read as a child actually calls that story "The Goose-Girl at the Well". I also have a 1979 reprint of the 1882 book Household Stories from the Collection of the Bros. Grimm, translated from the German by Lucy Crane and done into pictures by Walter Crane. In that book, the story is entitled The Goose Girl. This latter book includes all the original illustrations (though in black and white, not plates). There's a lovely full-page headpiece with the following poem at the bottom of the picture:

'O wind, blow Conrad's hat away,
And make him follow as it flies,
While I with my gold hair will play
And bind it up in seemly wise.'

Anyway, thank you for drawing my attention to A Sorceress Comes to Call. It sounds fascinating and I'll have to check it out!