Yeah, I should have moved as soon as I realised you were so close but didn't because of the work I had put in. I realised though I was being a dick and it wasn't fair on you so I demolished it and tried to put it back as I found it.
My current co-ordinates
Hole in the wall home: x-684 z-112 y 64
My work in progress build: x-289 z -1221 y 70
Which is here;
On a side note, as warp locations are seemingly shared, we could set up warps by our usernames which will be to our houses.