Progress Update - Episode 15

Quick little progress update.
Still working on the morning scene since it has a few variations. I hope I can finish it this week. I've had enough of creating MC waking up scenes. I've made quite a few already. Maybe I should just skip them in the future, but then again, it's an easy way to see when a new day starts. Or maybe instead of waking up in bed, MC's taking his morning shower or eating in the kitchen. Something to consider once I start working on the second day of this update.
I've also started the code rewrite. I've finished the first 2 episodes already. They are small, and not much is going on with pathing and relationship points, so it was pretty simple. Episode 3 is also almost complete, and it will take more time once I start working on episode 4, because the biggest changes begin there due to the Riverside girls. While working on the code, I'm also taking a look at the script and polishing it if necessary.
Here's another big change I'm considering doing. When I first created the first episodes, very early on, you had to decide between Erynn and Layla. It's the scene after the club, if you stay with Erynn or go with Layla to the train station. Depending on your decision there, one of those routes would be closed. But after a lot of feedback, I changed it to you don't have to decide and continue on both their paths. That decision has bitten me in the ass so many times already. Even to this point in the game, you can still date both girls. Which doesn't make any sense at all. If you date both girls, Alexis knows you're with Layla, and Erynn probably tells her about the date and other stuff. That route was never planned, and it's just a big mess imo. And because of that, I had to scrap lots of scenes involving both Erynn and Layla because they couldn't be in the same scene because of their relationship status with the MC. Meaning, I'm considering reverting that decision, so you'll have to make a "harder" choice earlier on again. I know that it will shorten certain routes, and some of you probably couldn't wait for the drama that would cause if you're finally caught, but as I said, it doesn't make sense. Plus, there are other combinations that will cause the same drama if or when you're getting caught.
What's your opinion on this?