It would appear to address the issues raised in both of the amendments. As for one formulation over another, I think that's ultimately for you to decide.
The fact that you speak of an “officiant” who is performing a religious service, I think provides the context that is helpful from a criminal law perspective, versus whether you said “a religious official” performing a religious service. I think it takes you to the same place.
At the end of the day, your focus is the same.