mambera - sorry you had such a tough time with cd's last time. I honestly rarely had leaks with ds. We did prefolds exclusively with pul covers. I often, around the house especially, just had him in the prefold & then changed it as soon as he wet. When he was immobile I would even just lie him naked on top of a prefold & just place a clean one under him if he wet.
The few times we had a rash issue I switched to disposable for one or two changes with lots of cream & it always cleared up very quickly.