Thanks for your WD tips! TBH, he doesn't like long WDs since he was a newborn...
That's why we do bath earlier, so WD is only change, darkening the room, cuddling while listening/singing songs, bed. And sometimes cuddling means holding him back as he would arch back and wants to get free - but I know he's tired, so I tell him no more play and just don't let go of him.
And he has to have a pitch black room , otherwise he'd never settle...
As for routine, summer is coming now and it'll be almost impossible to start the evening before 7. So I decided I'll try to focus on a longer A time in the am and a longer pm nap, so that we still have enough sleep time. And I'm hoping for a later WU in the morning!