I don`t see why shouldn`t you keep the master/slave attitude without her playing fetch, or having golden showers (metaphorically). My master and I have never had trully vanilla attitude. Even when we don`t have time we still feel each other`s roles in the relationship. Once we decided to try a vanilla, just to see how was it. It didn`t work... It had BDSM elements.