Hi,
With Alfie, when he was reluctant to get up in the night, I stopped.
I would suggest moving the first wake up to later in the night and ditching the second.
With regards to the excited welcome, I call it a Cuddlestorm, we have a chair in the dining room I sit down take my glasses off and go with it. 😀.
I was a bit concerned that he might pee with excitement but he doesn’t and if I let him out he’ll do his business and rush straight back for part two.
At the moment where I am getting him out and taking him straight on a morning walk, he’ll go 20 yards the sit until I stop and crouch down so we have a cuddle in the street.
Sounds like you’re doing an ace job. Relax and enjoy the storm.