If I can offer a quick tip: Just pull it back slightly in the shower. Don't hurt yourself, but apply tugging. Try putting your fingers in your foreskin and stretching it out to sides, too. Something like 5-10% of uncircumcised guys can't retract by age 15, but with a little work, you'll get it. Circumcision would be way overkill. Just make sure not to force it behind the head in a way that it might get stuck. If that happens, lose your erection; there's a small chance that can be dangerous (although I've never heard of it actually happening).
Otherwise, yeah, just be patient and you'll be good.
"I don't believe in magic. But I do believe in interpreting coincidence exactly the way you want to." -Sherman Alexie