we do the same thing for day sleeps - chg nappy (take off jeans), drink of water, lie in bed and read a book or 2 - cuddle or sit on bed til he goes to sleep.
to resetlle day or night (he wakes in the night still) we go in, pick him up and cuddle him, drink of water, cuddle more - put into bed and he usually rlls over and goes back to sleep
Believe me we have had MAJOR sleep issues - i am shocked i am even givinga ny sleeping advice LOL!
I agree important to get on same page as DH, i have been there with the yelling at each other in the night about it - it aint pretty...