I think you should do a bit of both. Without a doubt, triggers will lead you to relapse, and you def don't want that, so removing triggers, whether it be not surfing the web at night or in bed, is very important. At the same time, you need to train your mind not to want to look at P. I think we've all been there, laying in bed at night, thinking about surfing the web for just a bit to help us relax, and there's no way of removing the trigger of lying in bed.
Luckily for me, something just snapped in my mind, triggered by a horrible case of ED, and now I just don't want P. I realize how horrible it really is, and don't feel the urges like I used to. I still feel them though, have thought about looking at P, and when I do I go back to this site and go through peopel's posts, it helps.
Since my reboot, I've noticed huge changes, and that's the biggest encouragement. My voice is much deeper, I have more confidence, less anxiety, and my erections are coming back. There is the occcasional flatline, but for the most part I'm coming back strong.
Good luck Phoenix, we each face a different fight, hopefully you'll be able to find the right resources to help with yours.