Hi Heaven. DD was the same at that age, but unfortunately we're *still* transitioning to one sleep.
I try and only let her have an arvo sleep every second day, and that seems to help. Otherwise, I wake her after 20mins in the arvo sleep. She always has a good 2 hours in the morn, so I figure the arvo one is just a refuel for dinner etc.

I have been letting her do whatever while we were away, but the 9pm bedtimes are too hard when its just me and her.

GL!!!