Sorry, you had such a bad night
Looking at the positives, you pushed out the A time yesterday and got a super nap. That's great! But that resulted in a very unsettled night. Now, personally I don't think it's OT as she had a longer nap than she's used to so it's very unlikely she ended up overtired after it. I think it's more likely she was unsettled last night from being undertired from such a good nap. So I think the A time was good, but she needs a shorter nap.
Since she seems to be at the low end of sleep needs, I would probably not offer a catnap today as I think it could cause her problems, and instead keep the afternoon very quiet and get her to bed nice and early.
Then tomorrow, assuming she has a better night and sleeps later (fingers crossed!), try the longer morning A time again but cap the nap at 1hr 30mins. This is still longer than she usually naps so she should be fine on it, but hopefully won't result in such an unsettled night. I think it will take a bit of trial and error to find what nap length will suit her, but it does sound like it will be a good bit less than 2hrs.
What do you think?
x