Well, i did the CTRL+Q thing, because he attacked me on sight again. I didn't kill his servant, i just rushed up the stairs, but they followed me. So i still had to kill the guards and the servant, but i have no problems with that.

I still have Valygar in my party though, i took him along to do the Watchers keep quest, dunno why... i kinda like the guy.
As far Jan... when i came back from the Planar Sphere, he was back in his house, but there wasn't an option to do his little quest anymore. I suppose he took care of that on his own. All he said was that he wanted to join up again. Bit of a weird situation.