If I remember rightly Rachel, the very first time I helped you ooohh, 2 or 3 posts ago now, we had to move Maya morning nap up considerably to stop early wakings. She was still on 2 naps then, but maybe that is the key, perhaps she does need long A time to get good nap and rid you of early wake ups. Got my fingers crossed.
Don't forget either if your going to give this a fair go you need to stick it out for at least a week to see if its working, don't be dismayed if it all falls apart after 2-3 days that is often the case, for it then to turn around again and get better again.
Just read your new reply, don't push bedtime to far at all. In fact I would stick with what you've been doing as changing bedtime up can really through them out. Give it time to see if its a solid routine before altering things again.