Exactly; baptism is a profession of faith and should accompany a believer in their walk but is not always necessary for salvation. The thief on the Cross is a an example of this.

The only way to the Father (as you covered in John 14:6) is though Christ and His grace alone is enough.

Of course, we should produce fruit when we begin walking with Him but works do not save; just grace.