Chastity and orgasm denial discussion

I currently take every other chance to play with myself when my girlfriend is not around. It is not that I wouln’t get enough from her. Usually every evening I play with myself while she rubs my body, slightly spanks me or pinches my nipples. It is really great for me, I sleep so much better afterwards. She is not always in the mood to have sex so this is a nice compromise which does not take much energy from her. Usually when I slack off a bit while studying, I browse some news sites, read an article or so and get back to studying. Sometimes I would also open Tumblr and look at leather boots and (ironically) chastity memes. After a few minutes of that I am usually too aroused to do anything else and just go relieve myself. Yesterday my girlfriend surprised me by dressing up all in leather for me. She came to me and kissed me very passionately. In the afternoon I already had looked at leather images and relieved myself, I had the feeling that I should not have done so. I confessed to her and she offered to repeat this another day. It did not took long for the leather to arouse me and I had an awesome evening, she had fun looking at my reactions to her. Today I often have to think about the arousing things she did to me and I was almost going to relieve myself again. There is enough sexual energy that she does not have to miss out on anything. At least I think so, perhaps the passion is missing out a little bit. The distraction and waste of time the regular masturbation when she is gone poses is just getting annoying. Once the arousal starts and I start to think about the great things she does to me on occasion, I have a hard time getting back to work without wasting at least half an hour. This is something I’d like to improve upon. Although the fantasy seems to strike some weak spot in the femdom-part of my brain, I do not want a 24/7 enforced chastity thing. I would much rather have a “normal” and loving relationship with my girlfriend. I once bought a CB-6000 since the thought of a bitchy leather dom putting me into enforced chastity gives me thrills. While trying it out I realized that hygiene becomes a concern, leaking precum and also I do not think it is healty to weak this thing constantly. So I look for a way which does not burden her (she is not really a dominant but rather caters to my leather fetish) but also makes me waste less time on masturbating when she is away. I want to prevent that I become so used to relieving myself instead of enjoying it together with her, even if it is just me masturbating in her arms. I have now put on the CB-6000 and I’ll give the keys to her when she comes home in a moment. I’ll tell her that I want to stop masturbating when she is out (lectures, working) but perhaps not wear it while she is home. Perhaps that is a good balance of stopping the urge and still having a relationship on equal terms otherwise?