Well we re-jigged things a bit - baby gate across our bedroom door, and doggo can now sleep wherever he likes, which last night was in the hallway for awhile, and then he sloped off to the back room, and then downstairs. Only one initial moan, and then this morning he mad a bit of noise at his normal 0530 time, but we shushed him and he went quiet again and SUCCESS!!! Thankfully he is not destructive so we can trust him not to wreck the place. He is one step closer to be being adopted to us now!