Actually another thing I forgot to mention is that as DD has got older her naps got longer on her own, I didn't need to do anything to encourage it, I think it's because she's more active crawling rolling etc. It's not a solution for now I know, but hang in there and it will get better!

I have the no cry sleep solution and have found the tips great, it takes time but I just refuse to do controlled crying.