Takamatsu looks like jealous of Yokoi situation, looking mad at him when he was caring for her well being. He has coworkers who just might fill the void in her heart... hope so.
Yokoi is right, until Saitou regain some level of peace and is less dependent on "saviour complex", things shouldn't progress.
Saitou have seen Azusa child Makoto, there's a possibility of inheritance of her and Yokoi condition, but they learned on their mistakes and he is being raised a whole lot better than they were.
This story pulls out a good point, Saitou thinks through stereotypes, which even in sexed age is pretty common.