Very true. And I'm not in the least concerned about the exact wording for Jesus...and to be honest, while I think your wording is excellent and scriptural, I believe anyone can get dunked but it's the faith that seals the deal...and is, in fact, preeminent. And I say that not to diminish the importance of baptism. Although I'm sure you've heard the old argument about the thief on the cross who wasn't baptized as an example of what I'm suggesting.
But bottom line, I don't think we're in any disagreement.
**but it’s the faith that seals the deal**
Not always......
Or the faith of the parents and the godparents in the case of infant baptism.