I think give the change before the DF a go - F occasionally woke during her DF and would fall asleep again by the end, but it never created an issue with feeding to sleep. I think if that's not your usual pattern it won't do any harm.
Have you tried using just cloth for nights? I've never used sposies myself, but use a cloth nappy with bamboo inner and microfibre booster for nights. Right now F is teething and waking to comfort feed several times a night, so a lot more wee at night than usual and the nappy is sometimes soooo heavy by morning, but no leaks. Don't know any tricks for boys though
Hope you find something that works!