Make Chiaki an after story exclusive route. Solves all problems. It would also allow you to save her for last while still being able to fully make hers and all other stories just have it be a choice right at the end of her route to wait a few years for her.