agree. both have various definitions in different cultures to be honest, but generally they refer to the same differences between the two.

i can imagine though, that a shaman in old times Europe, could have been identified by the church as a witch. (as confused we are about the definitions today, they probably were even more so back then.)