"and those members of the body which we deem less honorable, on these we bestow more abundant honor, and our less presentable members become much more presentable," (1Co 12:23).
Paul said 'we bestow' and 'our less presentable members', and he was not a member of the Church at Corinth, so I take it that Paul was talking about the entire body of Christ in 1Cor 12. Also I am not aware that the Lord appointed apostles at Corinth, yet Paul says, "and God has appointed in the church, first apostles ..." (1Co 12:28). Again, Paul must have been speaking about the entire Church everywhere when he wrote 1Cor 12.
I equate baptism by the Spirit to be His endwelling individual believers when they first believe, and not necessarily evidenced by tongues or fire.