We're in cloth with flushable liners too. Though it does tend to get round the edges of the liner often (he's had lots of looser poo recently, teething I think) but all stays in the nappy pouch. We're using the gnappy system which I love now, though still in 2 part bamboo little lamb over night. I'm looking to get some small g's for new baby too, they're quite expensive but you don't need many, and have a good resale. There's a whole bunch of fanatics out there for them, spending hundreds on old prints. Crazy people :)
After mentioning the 3 hour naps, DS has woke up screaming the last two days, after less than an hour asleep. I'm pretty sure it's teeth, but as he's fine all morning I don't feel right giving him calpol really. I have done today though, as he woke crying 7 times last night. Resettled himself within a minute or two, but still not the best sleep for him (or me).
I actually tried to explain to DS yesterday that as I am old, fat, pregnant and have a sore back, he should get up and get his own train from down the corridor. He didn't agree. 
How do you all manage discipline and the like? DS is very well behaved generally, but if I say "no" he just carries on doing something, or does it more for the attention. I've tried physically moving him away and sitting him down elsewhere saying "no" firmly, but he's not at all scared of my scary voice, and will often go back to do it again. I also do distraction or ignoring bad behaviour, and rewarding good. However things like turning the oven on I can't ignore, but can't seem to stop him doing it. Any advice very welcome (I can't lock him out of the kitchen, the doorway/arch is too wide for a stair gate.