We have success!
When I got home from work yesterday, Gabi was napping! She woke up at 6:00 (there was NO WAY I was going to wake her up before she was ready!), and went to bed again at her usual 8:00 bed time! AND she was still sleeping when I left for work this morning.
I'm so excited to finally be back on track. What a trying week.