Circumcision or Frenuloplasty?

I have a tight foreskin condition which is best described as follows : 1) I can retract my foreskin completely when flaccid. 2) I cannot retract my foreskin when erect. 2) If I put oil (provide lubricant) then I can even retract my foreskin in erect. But I always feel a sharp pain in my frenulum when erect and foreskin is retracted. I have been made aware that my frenulum is short and will require Frenuloplasty. My concern is that will Frenuloplasty solve the tight foreskin problem too? If that is the case then I am happy because I don't have to go through circumcision and can keep my precious foreskin. Or is there a chance that I'll have to go through the circumcision even after frenuloplasty?