help! 6 month old waking at night

My daughter is a week away from being 6 months old and every single night she wakes up every 2 hours, sometimes less.  She has been doing this since she was 4 months old.  Prior to that, she was sleeping 8-10 hours straight at night when she was 2 and 3 months old.  We are very consistent with our bedtime routine.  When she wakes, sometimes I nurse, sometimes I rock her to sleep and sometimes I can pat her to sleep in her cradle.  Sometimes it's very easy, other times it'll take me an hour of trying different things.  She is also still sleeping swaddled which has been a nightmare to transition out of.  Does anyone have any tips for sleeping or unswaddling? I feel like a zombie! I really don't want to do cry it out.