Did the short naps start after you increased her A time? If so, I'd go back to the last A time that worked and see if that helps. If it doesn't, we'll try something else. Much of it is trial and error with babies I'm afraid, so we'll see how this goes and then reassess 
You know, I don't know. I just went through all of my logs from the last couple of weeks and maybe you can help me make some sense of what's going on. I listed out the first A time of the morning. In some cases, before she gets out of bed in the morning, she will peep, get quiet for 30 minutes or more. I'm never sure what A time to use, but wound up using first peep time as wake up if her out of bed cry is less than 40 minutes later. If it's more, I go with the out of bed time.
With the broken naps happening, I started to increase A, but have had really variable results. When I get the short nap first thing in the morning, we never recover and baby ends up taking a total of 2 -3 hrs of naps all day (like today, poor thing was so tired at bed time.)
She is sleeping through the night (knock on wood!) from about 6:30/6:45 - 6/6:30. On the days where she's had really terrible naps, she sometimes will sleep a little later, closer to 7.
Ok, so here is my crazy log! Would love any advice if you see anything here. I just don't know what to do anymore and if I should just follow her cues and forget about A time. I have been trying to strike a balance between the two and things were going well for a week or two, but have gotten progressively worse.
6- 15 -- 30 minute nap, 1 hr 46 min A time. Didn't resettle and seemed happy.
6 - 14 -- broken nap, but long, 1 hr 59 min A time ** however, this is a case where the baby woke up, made some noise, and then got quiet again. If based on out of bed time, would be 1 hr 29 min A time
6 - 13 -- good nap, 1 hr 54 min A time
6 - 12 -- 35 min nap, 1 hr 55 min A time. Another case of wake up, peep, then quiet. Based on actual out of bed time, it's 1 hr 15 min A. didn't resettle, but was happy. burped when woke up.
6 - 11 -- 40 min nap, 1 hr 48 min A time. Seemed like she wanted to go back to sleep, but wouldn't resettle.
6-10 -- broken, but long, 1 hr 40 min A time
6 - 9 -- good nap, 1 hr 39 min A time
6-8 -- broken, but long. 1 hr 25 mins A time (wasn't sure what time she woke up because she peeped and then was quiet for about 40 minutes. seemed tired so put down early)
6 - 7 -- broken, but long. 1 hr 45 min A time
6 -6 -- 50 minutes, 1 hr 43 min A time
6 - 5 -- good nap, 1 hr 43 min A time
6 - 4 - broken, but long. 1 hr 40 min A time
6 - 3, good - 1 hr 55 min A time (but also a case where she woke up, peep, got quiet. Would be 1 hr 15 off of out of bed time).
6 - 2 - good, 1 hr 43 min A time
6 - 1 - good, 1 hr 43 min A time
5 - 31, good - 1 hr 41 min A time
5 - 30, good, 1 hr 46 min A time
5 - 28, good, 1 hr 41 min A time