Thats how it should have ended.
If they wanted post time skip drama, then they could have had kouki dealing him always being in love with Rin while having to technically be her brother. Mix in some stuff with him being a playboy or delinquent as a way for him to avoid having to face the fact...