The simple answer to your question is: yes, you will, if you are consistent in rebooting and don't give up!
I have a similar problem, I'm 27 y/o and started in my teenage years to fap on naked girls and vanilla sex, then I found out fetish/femdom junk and now after some years that junk is my main matter (about 90%) for PMO. I still like vanilla sex and vanilla porn, but I find the kink junk more exciting.
The best things that you can do are:
1) completely forget fetish/femdom or any other kind of porn; if your fetish attraction is porn-induced, then it will decrease week by week, month by month; if it's not porn-induced but "innate", then in any case your libido levels will improve also in "vanilla" stuff.
2) have regular contacts with your girlfriend, not only sexually (fingering, oral sex and other) but also with cuddles, kisses, massages, simple skin and eye contact, because that will feed your libido levels, give you a lot of mental and emotional relief and "connect" more and more your mind with reality again, after the years spent in the virtual porn world where your mind was used to find pleasure and relief. Remember that our main sexual organ is the brain, not the penis! If brain works, then penis works, but not viceversa...