Had DE and anorgasmia but now I have PE?

I'm curious if anyone else has had this experience.

When I was active with PMO, I struggled to get a full erection and had difficulty having an orgasm with my partner. I imagined that I was some kind of a stud because I could go so very long (half an hour, even an hour sometimes) without orgasm . . . but I was in denial about how I struggled to get fully erect and to stay erect.

Now, after a couple of years of not jerking off, I think that my body just got used to not having orgasms, so that when I got a gf and started having sex, I could still hold back on my orgasms most of the time and/or have sex with her for 20+ minutes and happily wrap it up without having an orgasm at all.

She said she felt uncomfortable with that. She didn't like how I was "holding back". I get that, I think. So, I made a conscious decision to stop holding back.

Now I have PE!

The last few times have been shorter than the one before, and this last time I ejaculated as soon as I was inside of her.
Yesterday, I tried to edge just a little in the shower. I knew I might get blue balls, but thought it would be good to test my self control . . . well, I ejaculated before I was even fully hard.

This sucks. Has anyone gone through this tragic reversal?? Any advice?