Thanks Beth for giving your time to setting out so many instances.
There certainly have been inconsistencies over the matter.

Rather than same church or same nation, I think the non-repeatability would be anywhere within Christianity.
However, I looked at the last section of the Oath (copied below here) which includes many 'levels' of Christianity, ie, Gospel, Protestant Reformed Religion, Church of England.

I think this whole matter is problematic and might cause lengthy dispute when and if it emerges in the future.

Final section of the Oath
Archbishop: Will you to the utmost of your power maintain the Laws of God and the true profession of the Gospel? Will you to the utmost of your power maintain in the United Kingdom the Protestant Reformed Religion established by law? Will you maintain and preserve inviolably the settlement of the Church of England, and the doctrine, worship, discipline, and government thereof, as by law established in England? And will you preserve unto the Bishops and Clergy of England, and to the Churches there committed to their charge, all such rights and privileges, as by law do or shall appertain to them or any of them?
The Queen: All this I promise to do. The things which I have here before promised, I will perform, and keep. So help me God.