Hi Stephanie- we do the long AM short Pm nap and it works fantastic for us, it works because we couldnt work out the shorter A times after a short AM nap, he was majorly cranky after a short AM nap all day and then it was just such a long stint before bedtime, too long for him, so we changed it round and have a pretty happy boy. its not ideal because some babies find they get OT with just a short nap in the afternoon and by bedtime they are wrecked, but not every baby

I think if you push your first A tiem by 15mins you miihgt get a better sleep. heres our routine (remember this is for a 12month old who can handle 4 hours A time)
wake 7am
nap 1 - 11-12.30
nap 2 - 4.30-5 or if i can get him to sleep earlier 4.15-5pm
bedtime 8pm
because there just arent enough hours in the day you end up with a 13 hour day but Caleb sleeps 11 hours straight without waking up once so it works for us

nauvoo - that was us with the 5.30am wakings and they have been gone for about a month now. we got rid of them by making sure he didnt sleep over 2hrs15mins in the day, anything more than that and we get the early wakeups again