Thought I would post am update, maybe this could help someone who is having the same issue.
Last 3 days we decided to let her nap as much as she wants. WU was 5.20-5.40am but no crying, and going back to sleep (kind of, rolling all over her bed) then up for sure around 6am and we would get her at 6.30am. Nap for 2-2,5hours 9.30am. Then no PM nap and 7pm BT.
She seems to be happy with this schedule as we dont have to cap her AM nap, when she always was upset that we woke her up.
I'm thinking about moving her AM nap later and later by 15-30min till we get to 12.30PM 2-2,5hour nap. And after that if we still have 5am-ish EW, then we will move BT by 30min.
If someone tried this, please let me know if this is the right way or if there is anything else we should know.