Looks like her A times are too short. I realise she has NW and you reduced A time because of that but it's a cycle which may not change until you change it. If you keep putting her down to early she will short nap and/or have long UT NWs.
I'd increase the A time to 2.5hrs now. Do 2hr 15 minimum for a day or 2 then increase to 2hr 30.
Shh/pat can be adapted, some just use a firm hand or a stroking hand, even a slightly rocking hand on LO if they need help. But if she is not fussing or crying for help then you can prob leave her to self settle with her lovey. If she doesn't like Shh now is a good time to introduce a key phrase instead, something like "it's sleepy time, go to sleep" It's worth having a stock phrase to see you through over the coming months (even years!) as there will be times you can use this verbal reassurance from outside the room.
Today with the UT nap until 9.03 and not settling down quickly for the rest of her nap, I would have just got her up, done a good long A and then tried again for nap 2.
It's tempting to put baby down early when you are tired because you're looking for that little bit of rest for yourself, I'm afraid it can backfire with a short nap and he spending the rest of the time playing and cooing.