Now she is 6months & I presume on solids the 3/4hour routine kind of gets "mixed up"
What is normal at this age is 4 day milk feeds & 1 solid feed, working towards 3 by 7months... so if you have introduced 1 or more solids, I would move to 4 hours... awake time at this age should be about 2.5 hours, so she should do about 2 x 1.5 hour naps + a 45min cat nap... they don't have to be exact, but you would expect 3 naps & around 4 hours sleep in the "day 12 hours".
With night, teething does mess it up & so does increased mobility & many other things.
Do you do a dream feed, if not a feed around 3am is not unusual & that "should" go away when solids are firmly introduced, although some babies do still need 1-2 night feeds past 6months even up to 12months old.
I also think at 6months if she needs re-swaddling to go back to sleep, it is a good time to wean her from that as she will only break out more & more as she gets older... gradually loosen it over a week or 2 .