I think it might be time to start dealing with Dirssi right after the timeskip. She would have no real choice but to wait while the college is in disarray and recovering, but she wouldn't wait forever.