yay on the no nappies Mayaness!

question for you ladies, or more of a "suggestions please"...
We have HUGE issues with sleeping (or more precisely, not sleeping). DD takes alot of input to get to go sleep.
Everyone and everything I read is telling me to: dream feed, and settle her right away if she wakes and stirs during the night.
But I have been unwrapping her (as she still sleeps wrapped) and removing her nappy (which may often be wet) and pottying her (and she often goes) and then putting it all back on again. The problem is that this process often wakes her if she was only drowsy in the beginning. But if I leav her in the wet nappy, she often grizzles for quite a while anyway.
Also, because she takes so long to get down to sleep, the "settling" time often needs another potty-time, or nappy change - and again, both of these are quite stimulating for her, so then we have to start over with settling again. Settling can frequently take more than 90 mins, which is 2 or even sometimes 3 potty/nappies, so 2 or 3 lots of "razzing up" / stimulation.
Is it possible to continue to do EC and settling, or will one be sacraficed while working on the other as it currently is?