Just read through some of your posts. Wanted to mention that with DS we kept 2 naps for a while, but increased his overall length of day. Not sure exactly the time frame we did it in, but we pushed his BT from an original 6:45 to 7:30 in 15 minute intervals, over the course of a few months (WU was usually between 6:15/6:30). When he was about 12 months or so we also started keeping a light on in the hallway so he could "read" in his crib before falling asleep after BT at 7:30, some nights that was 10-15 minutes later, and on the rare occassion up to 30 minutes (after reading the book to him we put it in the crib for him and just closed his door when we knew he was sleeping). This way he was falling asleep when he was ready, and not forced to when we thought it was time. This didn't cause any BT resistance or EW's (never really had that issue) and it even helped that he would sometimes read in bed in the mornings before calling out for us to get him up.
Looking at DD now, she wouldn't be ready for reading with a light on yet, so your LO may not be ready for it yet either, but it's something to think about/consider when you have 2 nap days.