We discussed this with the team and it's a really good point, in hindsight it would have been a good idea to add a choice for Pedro to make where even if he meets the requirements, he doesn't pursue a romantic relationship with Oscar.
Unfortunately we put a lot of work into writing dialogue variations that apply depending on how much time Pedro and Storm hung out together and we'd have to go over all of them to account for this, we planned the rest of the game around this, and there's the matter that people with old saves won't have these options set up... it's a good idea, but to be honest we would prefer the time and effort that would go into course correcting and implementing it to instead go into chapters 19 and 20. We have a game to finish, I think we've spent too much time tinkering with the Hinterlands chapter alone, wouldn't you agree?
We will keep this in mind for the rest of the game though, so thank you for bringing it up.