When I get the urge to fap what I do is set a timer for 15 minutes and tell myself to wait at least that long, then I will try to distract myself with anything I can. When the timer goes off I will say to myself ok I waited 15 minutes lets see if I can go another 15, or 20, or whatever. I will keep doing this until the urge passes.
It works really well for me and I suggest you at least give it a try if you are struggling to get a good streak going.
Good luck brothers.