I'm not dogmatic at all on 1 Cor. 12:13. As you say, the Greek phrase "baptized in/by the Spirit" is very close to "baptized by the Spirit" in other passages, such as Acts 1:5.
The difference in 1 Cor. is the addition of eiV en swma, "into one body." I assume that body to be the Church by the context: "many members," etc. So that appears to me to be a different kind of event from Acts 2. But I don't believe it refers to the forming of the church at Pentecost. To me, the evidence is not there in the passage for that interpretation. I think it is just describing how when someone gets saved they become part of the body of Christ.
However, the other passages all point to the same event, God giving power for service at Pentecost (Mark 1:8, Acts 1:5 & 11:16). Again, the other terms also refer to the same event: the filling of the Spirit (Acts 2:4), endued with power (Luke 24:49).
So the baptism by the HS would be at conversion, when the personis spiritual connected with/into the Body of Chrsit? One time event?