Hi hun, yep I'm thinking more A time is needed. I feel your pain. I had a chronic 45 mind napper until she hit the 2-1. With help from people on here, I managed to get her sleeping. Like you, w2s was my best friend during this time!
Average A times- BOOKMARK ME! If you see in this link 3hrs A is more what we would expect at 6mo. Some can do more or less, so it's only an average.
Another sign of needed more A time is the EW. Again, we had that too. It's like they use the first nap to catch up on lost sleep as it's too early and they self regulate their A time.
How do you feel? Dyt she could cope with a straight jump to 3hrs? If you do, I would hold it for at least a week and see if she settles into it and use your magic (w2s)

. You may find that's all she'll need A time wise, or else she'll get used to it and need another slight increase. You'll know what the short naps come back

The most common way people do it is to add 15mins, hold for 3 days and increase again. However, as your DD's A times are so low for her age, she may handle more of a jump? Wdyt?
Let me know? Also it'll be really helpful for you to keep a log of the days so we can see if a pattern is emerging and if we need to tweak one A time more than another for example. It is around now they start changing up what they can handle during the day wrt A times. Does all my rambling make any sense?

x