Hi! Our DD is about 15 months. We were going through the same thing 3or 4 weeks ago. Actually, DD goes through phases of being a bad sleeper. We've been getting her to bed earlier, too, and I'm thinking that's helped. We start the process around 6:15 by getting into pajamas and reading. Then dd likes a bottle or to nurse in the rocking chair in her room (more cuddle time). Then when she's sleepy, but not asleep, I put her in crib and stand there for a minute or two with my hand putting gentle pressure on her back. Then I quietly leave. Now, before a few weeks ago, she would instantly bolt up as I left - so it took a while for it to be easy. I did a version of Put-Down, by laying her back down, sitting in the rocking chair (by myself), and getting back up to put her down again. This could go on a while, as you probably know. I did this for a little over a week, maybe. Then I graduated to (after trying several put downs) to saying "g'night little girl, time for bed" and leaving the room. She would cry a little. If more than 5-10 minutes I would go in. The crying seriously only lasted 2-6 minutes. Now she doesn't cry at all. It's starting to work for naps, too. And by crying, I don't mean whailing. I might go in earlier if it's the whail type cry. Think I'm rambling. Good luck!
One more thing, for the early wake ups, has your husband tried to go in and settle her back? That sometimes helped for the early waking, rather than me.