Melissa - I would go with 645/7pm for BT. I generally find that 2 naps (regardless of which is short/long) encourages them to have a shorter night at this stage...
Claire - you and O are in that rut that me and Alexandra were stuck in... the short nights leads to 2 naps needed to keep BT at a normal hour, but then the two naps causes the short night... it's a tough one to get out of... we were in it for a month because she just wasn't ready to do the A times needed for the one nap days... so frustrating. Alexandra was cranky all the freakin' time - it was tough.
I got a 715pm - 640am last night! WOOT WOOT! Horrible to say, but I think her vaccinations broke that habitual wake that was coming back around 530am
Whatever works LOL! She seems to be napping closer to 2 hrs - 2hrs 15 as well, which makes her able to do the A time to bed and still happily sleep 11 hours + at night
Happy momma! Fingers crossed that I haven't just jinxed myself by typing this out :/