Today she woke at 5:40... Had a nap from 9-10:30 and another nap from 3-4:30... Since she woke early she will be in bed by 7pm... It should be earlier but she gets her last bottle at 7...
Well, 3 hours day sleep should be fine for even a 13 hour day. If possible, try to figure out how much day sleep she needs in a 12 hour day. Sometimes, EWs could be because of too much day sleep and not enough A time. How much does she sleep in 24 hours? For instance, at around this age, my DD needed between 2 & 2.5 hours day sleep + 12 hours at night = 14- 14.5 hours totally. More than 2.5 hours would mess up the night as would too less. If I was getting short naps, I would reduce the length of day. Your day seems fine though, even with the EW. I would have stuck to that myself.
You definitely are heading towards the 2-1. What you have described is a common scenario. Good luck! It's a tricky transition. Watch out for OT