Re: have it taught instead as social studies and as history.
You are right, that is how Religions are already studied and taught in Sociology. That is indeed an important aspect, teaching effects of religions. However, writing this from Germany, we still "teach" -believing- a religion in schools over here, the "teacher" is often a Priest, the pupils in a class are separated by confessions for this "lessons". That practice should stop.