Matt 28:19-20
Go ye therefore, and teach all nations, baptizing them in the name of the Father, and of the Son, and of the Holy Ghost:
Teaching them to observe all things whatsoever I have commanded you: and, lo, I am with you alway, even unto the end of the world. Amen.
Mark 16:15-16
And he said unto them, Go ye into all the world, and preach the gospel to every creature.
He that believeth and is baptized shall be saved; but he that believeth not shall be damned.
From Matthew's and Mark's account of the great commission, the baptism of the great commission:
--done in the name of, that is, by the authority of the Father, Son and Holy Ghost
--it is commanded
--it is administered by disciples (humans)
--it saves
--it is to be taught to new disciples (perpetually taught till end of the world)
--it is the means by which disciples are made
--it lasts till the end of the world.
From the above facts given by Matthew and Mark, these facts eliminate baptism with the Holy Ghost as being the one baptism of Eph 4:5 for none of the above facts are true of baptism with the Holy Ghost.
--From 2 Thess 1:8 one must obey the gospel to not be in flaming fire.
--1 Cor 15:3-4 the gospel is the death burial and resurrection of Christ.
--In Rom 6:3-7 when one is water baptized there is a death burial and resurrection that takes place hence one obeys the gospel when water baptized.
There is no obeying the gospel, [no death burial and resurrection] in baptism with the Holy Ghost, nor in 'faith only' nor in saying a 'sinner's prayer' nor in death bed conversions
I agree with your points.
There is one point I would like to add. The phrase 'baptism with the Holy Spirit' (or Holy Ghost) does not occur in scripture. It was a phrase invented in the later 19th century by Reuben Archer Torrey at the start of the Pentecostal movement.