It really feels like this was not meant to end so soon, because both current plot threads are being speedrun seemingly mostly because there's only 3 chapters left.
I also wasn't thinking about it before, but her old friend saying Makoto would look good with long hair feels like a setup so that...