I guess I can report my "success" story now. My DD's NWs are much better now!
On Friday night she woke up only twice, 1:45 and 5:45, and went back to sleep when I BF her.
Last night she woke up at 7:40, 11:45, 3:40 and 5:15, I BF her at 11:45 and 5:15. At 7:40 and 3:40, I just patted her a little and she went back to sleep. It took her 1h at 5:15 to fall back asleep though. But it's much much better.
Her morning naps are very predicatable. She has 2.15 A time and naps for 1.5-2 hours. I'm still trying to find the right timing for her afternoon nap though. I tried 2.35 A time she still wake up after 30 minutes. So I'm going to try 2.30 today. We've dropped the catnap. I figured she sleeps better with an early BT. I'm just hoping she can nap longer in the afternoon so we wouldn't end up with a very long A time before BT.
Thanks for all your help!