really agree to this, just make an option before those scene, example:
"WARNING! The scene you about to see contain [tags], [tags], [tags]"
"Do you wish to proceed and see this scene"
option 1: YES, continue with the scene
option 2: NO, skip the scene
and you are good to go with the rest of the game, no need to make different "vanilla" and "non-vanilla" version