As far as people actively triggered by the scenes go, I think a better compromise would be to make the D/s angle optional as far as possible. To me, the subtext lifestyle D/s angle was always exceptionally plain and obvious, but I am not the default viewer. Other scenes I find acceptable for flavour, but not anywhere as necessary as the bug fixing I have finally been promised.
Edit: a new perspective on the patch 7 scenes claims they're mixed, I'm currently not sure what path Larian has taken. I'll see when I have time again next summer. I have a little bit in spring, but not enough for a relaxed full play through. Would prefer playing something else.
