NT Wright delivered a few talks at the Calvin Institute of Christian Worship in 2007 on the Sacraments. They're well worth listening to. One thing he said in 'Part Two' I think is particularly worth reflecting on:
'Of course God welcomes us as we are, but God's welcome never leaves us as we are. Thank God. God's inclusiveness is always a transforming inclusiveness and that is precisely what baptism is all about.'