This too shall pass, my friend.
I remember thinking that DD's naps would never be more than half an hour... there were days that I would APOP her to sleep and put her down... 10 minutes would pass and she would wake up crying. She was OT, I was majorly OT and stressed out beyond belief! I thought it would never end. But it does. I am sitting here waiting for her to wake from her morning nap so that we can get to the grocery store before lunch... I might even have to go wake her.
Oh, how things can change in a 6 week span!
And just as things fall into place, you can rest assured that something new will pop up!