I don't have any advice for you about swaddling, my son loved it for the first 4 months, and he stopped right around that time.
I would like to share with you what we do for scheduling, and you can take it or leave it! We use the Baby Whisperer's EASY schedule. EASY stands for
E-Eat
A-Activity
S-Sleep
Y-You Time!
So starting when your baby wakes up in the morning, they eat first thing. Then have awake time for activity after that. After about 1-2 hours of activity, then it is time for Sleep, and when your baby sleeps it is You time! This schedule has your baby eating every 3-4 hours, depending on your baby. It just repeats itself through the day, until bedtime!
I thought this might be helpful for you because it really helps train your baby not to associate food with sleep. It has really worked miracles for us, our 5 1/2 month old started sleeping though the night at 6 weeks, and takes 3-4 naps daily. He also learned how to self-sooth (without crying it out) and never needs to nurse to sleep. Every baby is different, and the Baby Whisperer is great because she helps you understand what type of baby you have and then gives different advice for each different type of baby.
If you are interested in this at all I recommend Tracy Hoggs book the Baby Whisperer. It will walk you through step by step how to get your baby onto the easy schedule even if you didn't start with it. She also gives lots of great tips on self-soothing, and sleeping! :)
I hope this helps, good luck with everything!