Currently she wakes around 6/6.30
I start the nap at 12.30
Bedtime 7.30, we have tried earlier and later but it doesn't make a difference.
I agree with all the others have said but wanted to add another view too. Mine needed a later nap, later BT and a shorter night to get through the period from 2yo to 2.5yo when he dropped his nap. I did try capping the nap, it was awful, he didn't come around from his bad mood until just before BT so the entire afternoon was terrible for us both. some LOs have a relatively quick recovery after the nap is capped, others (mine) just don't recover. I also tried NNDs (a few months older than your LO though) and these were also a big fail for my DS, although he resisted naps he was tired to the point of dangerous by 4pm without a nap and I couldn't put him to bed at 4pm every day. The answer for us was to keep the longer nap and accept the shorter night.
Our nap gradually moved later, the latest it went was 2-4pm with 8pm BT (when really bad it was 8.30/9pm BT but that was a very short while, the 2-4 with 8pm BT was a very settled routine for a good amount of time). I'm not saying this is the routine you should move to, just giving another example of what works for some.
If it was me I'd move the nap 30 min later and BT 30 min later too. And see if she is more willing to go to sleep without an hour sitting in her room.
Another important aspect for us was the amount of physical activity. He really needed it. I did what I could to increase physical activity through the day, setting some heavy lifting jobs (carrying canned food from a basket to the kitchen or carrying bottles of craft paint from one room to another as a fun activity), going to the play park for running and climbing etc. And we introduced a pre-BT "toddler band" activity. We would choose an instrument and march from the living room around the room, down the hall, into the kitchen and back singing "we are the toddler band" and playing our instruments, then we'd switch instruments and go again, and again. DS would often end up jogging too. Even setting up a basket of toys in one room and sitting in another asking him to run and fetch the red car bring it back, now the blue car bring it back etc. Anything to get him properly physically tired.
hope this helps some