being intimate wile rebooting

OK so here is my situation. My girlfriend of 5 years has been pushed to her limit with my lying, betraying and cheating on her with porn and can no longer invest herself emotionally in our relationship cuz. However she is still my best friend and we see each other and interact daily she is very helpful and supportive of my rebooting and wants the relationship back but only once I'm pmo free. So the issue now is we have times we lay in bed watch TV or any type of cuddling situation I get extremely turned on just being with her and sometimes her gaurd will be up and she will shut me down but other times we will both get lost in the moment and when this happend last year it would lead to sex and I would fall back to at least one of pmo if not all three and end up bingeing for a few days will she feels depressed for allowing herself to do it with me and set me back on my reboot. So now this year the few times it has happened I have just fingered her to O wile I guess I am essentially not edging to say but the whole process is stimulating me sexually for a prolonged period without orgasm so pretty much the same thing I'm just not touching myself. So my PIED has gotten alot better on this last streak which is about 60 days with no O and day 6 pmo free but I'm still not 100% and it will not stay up for Long. So I want ideas on what to do I know I have to avoid any kind of prolonged sexual stimulation if I want the ED to go away completely not to mention I am fighting not just porn addiction and compulsive masterbation but also sex addiction as well. So I need to reboot inorder to get my girlfriend back as well as reach a normal sex live with her but where do I draw the line with physical interactions now and any good ideas to actually keep the boundaries we set and not lose track in the moment