I am creating boundaries for myself

I think you're trying too hard, man. It seems like you're focusing too much on your "streak". In my experience, that doesn't help at all.

 

I have tried approaches like this. They led to lots of shame for me when I failed. We need to avoid but we also need to build a meaningful life around us.

 

I find it much more helpful to think in percentages, not streaks. By that I mean to look at a given period of time (maybe a month) and look at how many days you did well and how many you didn't. Let's say 80% of your days in that period were clean; then go for at least 81% the next month.

You may have some slip ups, but this way your focus starts to shift more to the positive. With this approach, there is no room for thoughts like "I went for 30 days, but now watched porn once. Now I am back at Day 0". That is simply not true and it is also absolutely demoralizing. Like @ANewFocus already said, streaks tend to lead to an increase in shame, guilt and self-disgust. If you "end your streak" it builds up so many negative feelings, which will push you down more and more. I don't recommend that approach.

 

It's definitely beneficial to avoid situations which trigger you down the path of PMO.

It's good that you've identified your own problematic situations. It shows that you're not in denial about your issues and that you want to resolve them.