same here last year
switched the wind-down to one short book plus the usual tuck-in song and the stalling dropped fast
added the white noise machine on low right after and the door stays shut now without the extra trips back in
what timing worked on your end for that last step