Personally, I wouldn't resort to surgery unless it was absolutely necessary.
I would keep stretching it as long as it doesn't hurt too much.
Give it some time...it should stretch out.
Complete circumcision removes extremely sensitive nerves that give you pleasure and should be a LAST resort..
Foreskins are almost always tight on a full erection; even tighter if one is on sex enhancers. Once pulled back are sometimes difficult to get back over the head. One hint....remember the lube...never do any kind of sexual activity dry.