That's fine, I just thought I would throw it out there. I think a simpler solution is to make everything obtainable with or without certain partners on or off. Due to the living underwear being locked behind Female Partners and other things.
You can get living underwear without female partners on! Specifically, if Marin is off limits to you, the shop of horrors will sell it to you directly. Right now, it's only handholding I think that's out of reach for players that don't like female partners (and that hopefully won't take too long to change, though tbf, only girl npcs have handholding scenes at the moment anyways.)