Hi, Had the same problem until I made sure she knows that we do not wake up or pick up when is dark. So set yourself time that is suitable for you to get up. Let's say 6. If he wakes up at 5, just go into his room and do WI/WO or pick him up but do not leave the room until 6, and make big fuss out of it, put light on, take black out blind down. Soon he will get the message. I woul also cut his nap to 2 h,
So:
WU 6
S. 12
BT 7:30
I think once you can establish consistent WU times it will be easier.