For us, morning nap too early or too long would cause early wake ups. She's at the start of the 2-1 nap transition and you can keep the long am/short pm nap but I would probably look at limiting her am nap to 1.5hrs and offer pm nap around 3.5hrs A so that bedtime is slightly earlier too. So you could try something like this:
9.30am - morning nap
11 - wake her from nap
2.30 - afternoon nap
3.15 pm - wake her from nap
6.15pm - bedtime
Eventually you will probably have to push the afternoon nap to 3pm and maybe shorten it to 30 or even 20mins so that bedtime isn't so late.
When she wakes at night, do you have to help her somehow to get her back to sleep? Could she also be teething?