Addressing the OP,
Jesus Saves, who is the Holy Spirit. but the "Baptism ... OF", the Holy Spirit, places us into his, God, the Lord Jesus body the "LIVING CHURCH", (who are saved). or we receive a NEW BIRTH, or BIRTHRIGHT. supportive scripture, John 14:20: "At that day ye shall know that I am in my Father, and ye in me, and I in you."
and the Baptism ... "WITH", the Holy Spirit is for EMPOWERMENT as a result of our new birth, God, the Lord Jesus dwelling in us, and MANIFEST himself in us. supportive scripture, John 14:21: "He that hath my commandments, and keepeth them, he it is that loveth me: and he that loveth me shall be loved of my Father, and I will love him, and will manifest myself to him." (just read Acts chapter 2.
PICJAC, 101G.