If the scenes are skipping or you aren't getting the right scene, please please just check if your save is fucked.
Check the relationship variable 204 is set to 2 before you try to get any of these events. Then just sleep at an Inn outside the city to raise it to 3. Any number higher than 3 will literally cause the game to skip since it tries to trigger events that arent even done (eg kohaku telling you to guard while she fucks yarizo then it skips aka no scene)
I'm sure saves are like bugged because before this version the relationship values worked a bit different.
I have no clue what the fix techno released does exactly but this could be a fix for the current version w no patch.