I agree with you and think that's the reason why it's so important to differentiate between two sorts of Baptism.

John 3:5 Jesus answered, “Most assuredly, I say to you, unless one is born of water and the Spirit, he cannot enter the kingdom of God.

Mark 16:16 He who believes and is baptized will be saved; but he who does not believe will be condemned.

Matthew 3:11 I indeed baptize you with water unto repentance, but He who is coming after me is mightier than I, whose sandals I am not worthy to carry. He will baptize you with the Holy Spirit and fire.

Luke 23:39-42 Then one of the criminals who were hanged blasphemed Him, saying, “If You are the Christ, save Yourself and us.”
40 But the other, answering, rebuked him, saying, “Do you not even fear God, seeing you are under the same condemnation? 41 And we indeed justly, for we receive the due reward of our deeds; but this Man has done nothing wrong.” 42 Then he said to Jesus, “Lord, remember me when You come into Your kingdom.”

Source:The Bible (NKJV)

CONCLUSION:The criminal in Luke 23:39-42 died without "Water Baptism" and was saved nevertheless, because he was saved just through his faith (Ephesians 2:8-9) and has got the Baptism with the Holy Spirit (Matthew 3:11).

CONCLUSION2:All of us see now which Baptism is meant in "Mark 16:16".This passage shows who comes to Jesus Christ will not burn in hell just because he's in a poor country or in prison where people get no water (or water baptism) before they die.

CONCLUSION3:Of course the Water Baptism is important nevertheless, this is proven by the fact our Lord wanted to be baptized what shows he wants his followers do the same.When Judgement Day is it will be a difference if a human found Jesus Christ just before he died and there was no chance for baptism, or if a human found Jesus Christ earlier and just didn't want to get a Baptism although he had the chance to get one.

I think this difference will be crucial when we get our rewards (1. Corinthians 3:12-15), nevertheless it's important to decide between these sorts of Baptism when we talk just about salvation, because some people think they would be lost when they will not have a Water Baptism before their end comes, what's not true of course.

CONCLUSION4:Baptism with the Holy Spirit > Water Baptism