Suggest Treatment For A Swelling On The Foreskin

Recently I began to notice that the foreskin on my penis was lightly swollen. At this point I thought I had Paraphimosis, except the foreskin is not stuck behind the glans. It hurts to pull back the foreskin (though this is in partial due to the dry skin I am suffering in conjunction with stretching the skin). When the foreskin is back, there is the tight "collar" and the swollen skin surrounding the glans. I am keeping it clean (pulling back the foreskin every day during my shower and making sure everything is clean and that there is no necrosis). If it IS Paraphimosis, and I have successfully gotten the foreskin back over the glans, should I just let it heal?