Hi Kitty!
Right now, my nearly 5 mo is doing A times around 2 hours. I am not having the issues you are with naps, but nights have been going progressively backwards.
As Liz suggests, why not try a longer A time and see what happens? After all, since you are spending so much time trying to settle her, the awake time is pushing 2.5-3 hours anyway.
Also, like you, I don't remember this being as hard the first time around