When it comes to bed time and your baby is wound up and doesnt want to sleep, what I found works great is give the baby a nice warm bath, dress them immediatly after the bath to keep them from getting cold, feed them and my son would fall immediatly asleep. Worked every time!
I just started doing this with my daughter and she almost slept through the night! It works like a charm. I still swaddle my daughter and she sleeps great.