Doesn't removing religion from the all of (1)the school curriculum automatically remove the need for any rejigging of who goes where, plus the advantage of all of the children mixing, growing up together and likely becoming life long friends regardless of whatever the religion, or none, of their parents?
(1) I'm not suggesting removing religion from where it would be ridiculous to remove it, from say history lessons for example, or a humanities lesson.