Jason, I think the important thing to ask is...what constitutes "baptism"? If I'm correct you're speaking of baptism in the sense of "water baptism" with distinction from the Holy Ghost baptism.
There is another perspective. Jesus said,
(John 3:5 KJV)
(5) Jesus answered, Verily, verily, I say unto thee, Except a man be born of water and of the Spirit, he cannot enter into the kingdom of God.
If "water" is meaning "water baptism" please note that Jesus said, "and of the Spirit". The connotation is that man's entire person must be baptized. You see our bodies are water baptized and our spirits are cleansed and empowered by the baptism of the Spirit. This would indicate that "Baptism" has two parts to a whole...water and Spirit. Thus while one might be water baptized, unless they have been baptized with the Holy Ghost they have not yet experienced the fullness of baptism, i.e., being born again.
Just a few thoughts I thought I'd throw your way.
Threaded Mode
