AEAS or SAEA, whichever, is pretty normal, and DD did that some while transitioning to the two hour. As far as we go - she was never ever ever a good napper at the shorter EASY times - a CHRONIC 45 minute napper, so yes I would have killed for an hour nap back then
But now that we've gone to the 4 hour easy she takes 2x 1.5-2hour naps and sometimes a catnap as well. The catnap would be ideal, but with DD at the sitter's in the morning our times get screwed up and naptimes are never when the "need" to be so sometimes the afternoon nap is much later so it kind of combines with the catnap. That has worked OK for us, but again is not ideal.
I think our girls are about the same age - lo was 19wks yesterday, and she's staying awake a good 2 hours now before showing sleepy signs. We didn't really work up to that, just kind of went cold turkey and that was ok. She was cranky a few days with staying up that long, but has never been hard to put down for a nap when she is truly tired. Not sure how easy your lo would be to go cold turkey, but that has definitely helped our short nap situation! When we were transitioning and she was still so used to the 45 minute naps, I just got her up and did A time until it was time to eat again, and for a while she was pretty dog gone tired by the time we got to the next E time (read: she fell asleep during the next bottle), but the naps did improve on their own for us.
If your lo is waking up and just talking, again I'd still leave her. If you are trying to extend the nap then I would think pu/pd would be appropriate - IF she is crying. Every now and then we deal with 45 minute naps, but I can pretty consistently extend them by getting her up if she is crying and doing a bit of rocking in the rocker and singing our wind down song. If she is hungry (from our wacky schedule btwn sitter and work) sometimes I'll feed her a bit before putting her back down to finish the nap. Obviously feeding in the middle of the nap isn't ideal, but there are times when I know dd is waking early from hunger just because of the way our day has fallen.
I think my first course of attack would be to extend those wake up times - you can try cold turkey, and if it doesn't work and she ends up in a meltdown you know that won't work and will have to do it more gradual, or you can just keep with the gradual plan - whatever you think will work best for y'all! And hopefully the naps will improve on their own like ours did - if not, you may have to try more nap extension techniques like wake 2 sleep, etc. I hear DD waking from her nap - most likely hungry
Good luck!