In this sense, I’m afraid there is nothing to “fix.” Both Rumple and Rumbelle fulfill a specific role on the show, and it’s unlikely that this role will change.
And because they fulfill a specific role and because there’s no “fix,” when they do inevitably reconcile it’s going to feel rather hollow.
[adrotate group="5"]
"He was a lot of things to me" "The only conclusion was love"