Inconsistent ED // sex without O with my partner feels like edging

What's happening troops, first time poster here! I've just turned 20 y/o, just started NoFap approx 30 days ago after experiencing ED for the first time with my girlfriend of 6 months. Didn't realise i'd been addicted to porn because i thought i was mainly on par with a lot of my friends, probably PMO'ing on average every day with the odd day off, since i was maybe 16 (with internet porn), and almost always watching pretty vanilla stuff. Had never had a problem with my girlfriend in the 6 months we'd been together, except for patches of low libido, but after losing it during sex one night i started freaking out, done some research online and discovered Nofap. I wouldn't say i have severe ED at all because 90% of the time at the moment when im with her i can get it up and use it. Since realising what i had to do i've completely stopped watching porn and haven't masturbated at all since.

Have started to feel the benefits recently and have explained the situation to her, she's been really supportive and i've not O'd in two weeks now even during sex with her. We're pretty loved up and i find her so attractive but the thing which has really confused me so far is - i've been feeling a great deal better since the first couple weeks but ED has been really really inconsistent since stopping porn! Some days i can get it up just by looking at her, others i need to kiss and touch her for it to happen, but on a couple of rare occasions (last night being one) even when im in bed with her fooling around my wee man is completely lifeless - finding this really weird, has anyone else experienced anything like this?

My general libido since starting NoFap has been up and down like a yoyo, and although i think it's probably slight chaser effects from when i have O'd, i'm just wondering if this is a normal part of the process, as i'd been hoping for slightly more linear results.

Also a side point, recently we've continued having a lot of sex, and generally are having pretty gentle sex until i feel an O coming on (not taking long lol) and then im pulling out, which is great and we are both enjoying it, but to me i feel like it might be counterproductive as it basically feels like edging, even though everywhere online seems to be saying sex without O can really benefit a reboot. I'm getting a circumcision soon because of a tight foreskin so i'll not be able to even think about sex for over a month (actually really lucky timing in terms of rebooting with a partner!!), but not sure whether to maybe stop having sex completely until then, in an attempt to solve this. That sounds like hard work though!

Sorry for the long rant, any help/experiences would be so appreciated!!