Do you not see that Scripture distinguishes between being filled with the Spirit, and baptized with the Spirit?
I think You are not focusing on quite correctly. You cannot mix Water and Oil.
You also can not water baptism, with spiritual baptism. Although many try to do just that.
I read Your question as an honest One. I understand baptism as two kinds. First, there is a physical baptism, which is done, usually, with water.
There are, however, a TRUE baptism which is accomplish by The Spirit Of God; and It is spiritual baptism. God The Elohim has chosen to use both in different ways, for different reasons. The Baptism which John was doing was a physical baptism with water.
That One occurred BEFORE Jesus Christ came into Isreal. Where did He come into to? That is very important!
The Baptism that is in place in This Age is, Spiritual Baptism only! Yet there be many who insist on saying that water baptism is needed to become saved!
What saves a person spiritually? Is It water or The Spirit Of God (The Elohim of Genesis 1:1 (Us) ?
I hope I have made This subject more clear to You. If not, Email Me and I will do My best to cover It better.
DeepSeeker