Disagree.
There was always a "Church", and as for offices? 1st Timothy and Titus seem to disagree with your reasoning.
Furthermore, Paul was clear in stating he was not stating a commandment, but with permission:
1st Cor. 7:6
6 But I speak this by permission, and not of commandment.
I reject, based on the Bible, the teaching that an office holder in the Church must be celibate. Clearly through the above text the opposite is true.