The timeline when spoken.... (After Jesus was resurrected, and was before Pentecost took place. )
On one occasion, while he was eating with them, he gave them this command: “Do not leave Jerusalem, but wait for the gift my Father promised, which you have heard me speak about. For John baptized with water, but in a few days you will be baptized with the Holy Spirit.”Acts 1:4-5
Do you see the change about baptism types that was to take place?
It took Peter all the way to Acts 11 to finally figure it out.
Up until then, Peter had been thoughtlessly commanding water baptisms.
Then!
He finally remembered the words Jesus spoke to him about water will be replaced by Spirit baptism.
We all have to learn to give up certain things we assumed and took for granted before we are saved.
The problem is that James also continued the narrative of works-based justification, so the idea of evolutionary understanding in Peter's beliefs, I don't buy that train of thought for what I feel are really good reasons...if I'm understanding what you wrote.
MM