I know exactly what you mean about the no life with stupid o'clock awake times! Some nights I've wanted to go to bed at 7 at the same time as DD! I HATE 5am and she'd struggle to go back to sleep at that time too, no matter how much I ssh/pat etc. just made her and I miserable.
Might be worth an EBT for a while to try and get more sleep out of her then more Y time too? Some nights I've had DD in bed for 5.40pm... It was lovely cooking dinner without her swinging on my trouser leg!
I know about the first A and EW because of the thousands of posts I've read on here at 5am when DD was awake and I was desperate for answers. I also posted myself on the naps, night wakings and easy board to finally work the little munchkin out.
Also, since extending her awake time in the morning from 2hrs to now 4hrs + I no longer get the EW. Now she stirs at 5 and goes straight back to sleep because she knows she won't be going back to bed anytime soon I presume! I've had soooo much help about DD's routine and it turned out she was completely different to what I thought.. It took the experts on here and a fresh set of eyes on my routine to figure it all out. She has always been a awful 45-minute napper so I have to reinforce the first A to ensure she has a good first nap or else everything goes out the window!
One thing I did do which may or may not help, is to keep the 12hr days, 12 hr nights. I think this is something that's overlooked when we're concentrating on each A and forget about the day as a whole. So if she did wake up at 5.30am and refused to go back to sleep, I would make sure she was in bed by 6pm at the very latest. At least then when I did get an EW, it knew I could stretch the first A more as she's had a good nights sleep iykwim?
But as your LO woke up at 6pm and was in bed for 7pm that's not bad at all really! If DD had 11hrs, yes I would try and stretch it, but a little at a time. It's so easy for them to get OT for that first A.
For my DD EBT sorted out the OT when I messed it up and stretched her too much too soon, then we could start from scratch. Then I moved everything including mealtimes forward 15mins every few days or so like we do with daylight savings. It meant she had a BT of 6 for a couple of weeks, but then it gradually got later to a more respectable time. Actually I do miss that hour before DH got home, DD was in bed and I had Y time then, but we can't have it all eh?!
Good luck with it, as I said, it might be worth popping over to the easy board to get someone to cast their eye over your routine if you're concerned about her sleep. It helped me tremendously!
Xx