Any way you could maybe put yourself in more situations where you can't masturbate or don't have adequate time to? It would help limit the time for you to masturbate if you're uncomfortable or unhappy with the amount of time you spend doing it.