Thanks Scott
Option B is indeed what I am doing now as some interior walls indeed differ from one bathroom design to the other.
I asked the question because it feels a bit hacky to do so.
If for example I want to change my roof, I now need to do it in both versions..
Which is not a huge problem now I know this is the chief way to go..
Thanks again.