Soothing himself to sleep...?

Keep on doing what you are doing. When he doesn't want his nightly ritual, he'll let you know. Hold onto those moments for as long as you can because once they are gone, they're gone forever. My children are grown now but I do miss the times when they were little. Take the time for your baby, you won't regret it.