I just read through and I see the nw's arent going away she is just learning to settle herself for them. Thats a really good thing, but imo you really need to get back to 2 naps. The reason she is waking so many times at night is because she is OT. Her nap is early in the day and not lasting long enough to get her to that late BT. If you really must keep her up so late at night, then I would either get her back on 2 naps or figure out how to get her to sleep much later in the mornng.
You said she gets sleepy pretty early in the morning, so I would follow her cues and put her down for a catnap when she looks like she is getting tired. Let her sleep 30 min. Then get her up and put her down for a nap 4-4.5 hours later. If she fights a nap after 4 hours then try 4.5 hours and if she still fights it try 4.45. It's a matter of getting her timing right so that she can get the sleep she needs and make it to BT without getting OT.