I think Vaughn will be coming back for good, supposedly the ending of the episode is going to leave that option open. I don't know if anyone's read it yet, but on the chat transcript with Kristin (from E!), she said:
"I'm told Lena Olin is expected to return for "at least one [episode], maybe...