You yourself referenced upthread the passage that there is One Baptism. So how come now you argue there is a water baptism and a spirit baptism?
Here are some other references to consider when considering that baptism is essential.
“But when the kindness and the love of God our Savior toward
man appeared, not by works of righteousness which we have done,
but according to His mercy He saved us, through the washing of
regeneration and renewing of the Holy Spirit,”
“whom He poured out on us abundantly through Jesus Christ our
Savior, that having been justified by His grace we should become
heirs according to the hope of eternal life.” - Tit 3:4-7
And how does the Spirit do this?
Then Peter said to them, “Repent, and let every one of you be
baptized in the name of Jesus Christ for the remission of sins;
and you shall receive the gift of the Holy Spirit.”
“For the promise is to you and to your children, and to all who
are afar off, as many as the Lord our God will call.” - Ac 2:38-39
More here....
http://executableoutlines.com/hs/hs_06.htm
How about a reference that SUPPORTS your argument.
Spirit Baptism Saves Us, Not Water Baptism!
INTRODUCTION
1. Another objection to the necessity of baptism involves making a
distinction between baptism in the Spirit and baptism in water;
this view proclaims...
a. “The baptism which saves is a baptism in the Spirit at the point
of faith”
b. “Passages like Ro 6:3-7, Ga 3:27, etc., refer to Spirit baptism,
not water baptism”
2. Those upholding this view point out...
a. There are many different types of baptisms in the Bible
b. We should not assume that water baptism is always the subject
under consideration
3. As expressed by one proponent of this view...
a. “There is a way to distinguish between water baptism and Spirit
Baptism in those scriptures which do not specifically tell which
type is being discussed.”
b. “That way is this: if the passage is talking about being placed
into Christ, then it is talking about Spirit Baptism, not Water
Baptism, for Spirit Baptism is how we are placed into Christ.”
c. “...in Romans 6, for example, it is obvious that the context is
being placed into Christ and the passage dwells on the believer’s
identification with Christ, with His death, and with His
resurrection. In this passage, the believer is not baptized into
WATER, but into the death of Christ.” - Baptism and Salvation,
Charles T. Buntin
— Of course, this argument presumes the very point to be proven
[There are several problems that I have with this effort to explain
away the necessity of baptism in water for the remission of sins. To
begin with, the Bible teaches...]
I. THERE IS ONE BAPTISM
A. THE BIBLE DOES DESCRIBE MANY BAPTISMS...
1. At the very least there are six...
a. The baptism of Moses (Israel) - 1Co 10:1-2
b. The baptism of John, a baptism in water - Mk 1:4-5
c. The baptism of the Holy Spirit - Mt 3:11; Lk 3:16; Ac 1:5;
2:1-4; 10:44,45; 11:15-16
f. The baptism of fire (judgment) - Mt 3:11; Lk 3:16,17
d. The baptism of suffering (persecution) - Mt 20:20-33; Lk
12:50
e. The baptism of the Great Commission, which was a baptism in
water - Mt 28:19; Mk 16:15-16; Ac 2:38; 8:12-13,35-38;
10:47-48; 22:16
2. Some include two more...
a. The baptism of Noah, metaphorically speaking, which
involved water - 1Pe 3:20
b. The baptism of Jesus, which involved water and the Spirit
- Mt 3:16-17
B. THERE IS NOW JUST ONE BAPTISM...
1. In describing the unity of the Spirit...
a. Paul proclaims there is one baptism - Ep 4:3-7
b. Just as there is only one Lord, one faith, one hope, etc.
2. To which of the six (or eight) baptisms was Paul referring?
a. I believe we can safely rule out all but two
b. The issue boils down to this: Is the one baptism of
Ep 4:5...
1) The baptism of the Holy Spirit?
2) The baptism of the Great Commission?
— Or might there actually be a connection between these
two, with the end result there being one baptism with
two elements: water and the Spirit?
[Whichever, we cannot have two or more baptisms; there is only one
baptism! Now let me explain why regarding the one baptism...]
II. IT IS THE BAPTISM OF THE GREAT COMMISSION
more.....
http://executableoutlines.com/ba/ba_09.htm
You can believe as you will. You can read INTO Scripture all that you want it to say. God says what He means and means what He says. And He doesn't give coded meanings. One Baptism in the dispensation means what it says: ONE baptism. Not water AND the Holy Spirit. That's two.
Just wanted to point out that in verse 21 Peter said, "And everyone who calls on the name of the Lord will be saved." Also, the assembly Peter was speaking to, professed their belief in Messiah by asking what they should do next:
Acts 2:37 When the people heard this, they were cut to the heart and said to Peter and the other apostles, “Brothers, what shall we do?”