hi there, to be honest I wouldnt be doing Pu/Pd, it wont actually work, you see she is going to bed too early therefore she is only sleeping the amount of sleep she needs for only having been awake that long, so she will be rested enough and therefore PU/PD wont work. what you need to be doing is gently increasing her A time by 15mins every three days. she is showing tired signs early because she is used to going to bed early. now because she is grumpy as you described her then you need to do it really really gently and to be honest, even my Angel baby has a meltdown at a baby class if he isnt home in time for his nap.
So heres what i suggest, when she gets up at 7am do what you normally do and at 8am take her to her room, start her wind down, whatever that may be, reading a book, looking at photos, something very low key, nothing stimulating AT ALL. then at 8.10am put her in her cot to allow her to fall asleep, she may still do a short nap because ideally she needs to start getting up to a 4 hour EASY, but let her sleep until 10.30 if you can get her to, otherwise just feed her around 10.15 and repeat the process all over again.
she is going to bed undertired at the beginning of the day and the result is that she is overtired by the end of it.