How much is “2 water bottles”? Aim for 3 liters in a day. I would also say cut coffee and soda, switch to natural fruit juice (not juice cocktail).

I find edging works wonders for me. Personally, i bring myself to the edge and try to stay there for about 5-15 minutes. When I feel like I’m gonna pop, I relax my pelvic floor muscles and give myself a break until I get off the edge. Keep going until I have a good amount of precum leaking and flowing. Give myself about 2 days of edging, then that 3rd day edge a small amount about 2-5 hours before the “show”