Another fan of the Nappy Lady and Fill Your Pants here.
On the Nappy Lady's excellent advice I went with birth-to-potty Charlie Bananas for day (so cute!) and Bumbles for nights, with Motherease wraps over (totally bomb proof- only one poo leak in 2.5 years!). All brand new because I am a spendthrift.
At 2.5 years in, we are teetering at the potty stage, and the Motherease wraps now go over the Charlie Bananas too, as they are not quite as waterproof these days as I might like, but there you go.
We also have an ongoing problem with soap buildup since we got a lovely modern washing machine which only uses just as much (or little) water as it thinks you need- we are now on 30ml of Ariel bio powder per nappy wash (you can use less bio than non-bio, so less likely to build up), and adding 12 or so extra rinses (! Fortunately five at a time, but still!). Miofresh is the worst for buildup- I much prefer BioD Nappy Fresh. Charlie Bananas want you to wash them at 40, so you do need to add something.
For the first 20 months or so the Charlie Bananas were ACE, some if the PUL lining is beginning to go now though, and I think the soap buildup and the massive toddler pees mean that we do need to pop a wrap over (which is not really a problem). Also, we use disposables for travelling, and tend to pop a wrap over those too, just for belt and braces.
We also happen to have a bidet douche in our bathroom, which is just the best thing ever, as it is basically a shower head by the loo for sluicing poo down the toilet. If you happen to be redoing your bathroom, its well worth it.
Also worth it is making sure that your washing machine allows you to use extra water in your rinses! (might have a super-rinse button, or anti-allergy, or similar. Mine is a good machine, but too clever by half with the water saving)