Your questions are a bit tricky
If it was me, I would wake at some point in the morning, but not necessary at 7, it could be 7:30 if it works better for you and even 8. It also depends on when is her BT, you are aiming to a 12h day, so you can aim for a WU when you have a set BT.
I never woke up from naps. I didn't see the sense, when I finally get a bit longer nap than 45min to wake him up. I know that Tracey said to wake them up, it just didn't feel right to me. When he woke up I just adjusted the rest of the day.
It could be that because you wake her up now before she had the chance to have a restorative nap of at least 1.5h she becomes OT be the afternoon and then it's hard to put her for a nap.
the night is pretty ok, your NW are fine except for the beginning of the night, but that as well I think is because of OT. Once you get the afternoon ok I think she will just wake up later in the evening.
When is her last feed before BT?
There is also lots of info here if you want to have a look:
http://babywhispererforums.com/index.php?topic=186622.0Good luck!