Another suggestion: if you wanted to try and push the am nap up just a bit, a friend of ours had some luck by gradually moving it earlier (though I think they were doing this for bedtime, and not for a nap). For example, if nap is at 10:30am, you could try it at 10:20 or 10:25am for a day or two, then back to 10:10 or 10:15am the next couple days, and so on until you reach your goal time, whatever that is. Maybe napping earlier (e.g. 10am) would have her naturally wake up sooner than 2 hours later, and allow you to more easily incorporate an earlier pm nap.