Hi there
First of all, well done on beating the 45-ers - it took us until Katie was 8 months old to get rid of them!!
My guess is that it's not the swaddle, but some other reason that's causing her to wake and fight it. I could be wrong, but that would be my guess! We all wake up several times a night, and if she knows how to get herself back to sleep and is nice and relaxed she should just be able to go back to sleep herself without fighting the swaddle.
Your routine looks great - except I would put her to bed at 7pm rather than 7:30pm. 2hrs A time seems too long after a 45 min catnap especially when her A time is only 1.5hrs earlier in the day after shorter naps.... do you bring her naps earlier if she has a shorter nap due to being out and about? You want to make sure she's not overtired as OT is a really common cause of NW.
Now in terms of some of your other points - she's too young for PU/PD so you have an excuse not to do this for a while longer yet! You would use shh/pat at her age.
If you are getting into the habit of lying in bed with her and BF in the night then she may decide that this is worth waking up for - she gets a cuddle with mummy and some nice milk! I can understand you not wanting to wake your son and DH, but if your DH is anything like mine he will sleep through the loudest cries - and anyway if he wakes up, maybe he could help out?
You say that you give her a dummy when she wakes in the night - does she need it to go to sleep always? If so this may be the problem - it's common to get dependent on the dummy around 3-4 months of age.
So, in terms of a plan - personally I would go with a 7pm bedtime to make sure she's not OT, make sure you adjust your naps if one gets cut short (it sounds as though you are doing this already), and agree with your DH a plan for getting her back to sleep without using a boobie or getting her into bed with you. Probably just shh/pat. It will take longer initially but once she realises she's not going to get fed it will get quicker. Obviously feed her at 4am or whenever you think she's hungry.
And it's a good idea to try nights without the swaddle if you think this will help - we stopped swaddling at night at 3 months but carried on for naps until about 6 months as we always had problems with naps and the swaddling helped
HTH!
Bryony