I am not very familiar with contemporary Christian music, so I can't think of something immediately. But I am wondering if the lesson should focus more on God's being pleased with Jesus, his beloved son, rather than on our own baptisms?
Wandering around looking for Jesus' baptism sorts of songs I ran into "Wade in the Water" which led to this less than perfect quality video of Alvin Ailey Dance's spectacular choreography in Revelations. Not sure if you can use this somehow, but I am sharing it here for any dance lovers in the group to enjoy.