I actually bought one when I was out. It wasn't exactly what I was looking for (zinc and castor oil) but I figured I might as well try it. It's called Sudocrem
http://en.wikipedia.org/wiki/Sudocrem . I've been using it for a couple weeks now but I'm also still using the Q-tips as well. Using both I'm now able to retract my foreskin all the way, even when erect. It's still a little tight but it doesn't get stuck behind the glans. But the thing is, if I leave the Q-tips out, even for a few hours, it starts getting macerated pretty quick. The Sudocrem seems to slow the process but doesn't stop it from happening.