He is still there.
spar with rhot and sleep at night in the temple until you encounter his two visits in your room. talk to him about this then allow him sleep with you and enter your room without permission.
Yes, I actually just located Xeroth. Forgot that you find him in Old Temple/Corrupted Lake
And thank you, I also forgot about the resting scenes.