That smell is not an unclean smell, it is totally natural. It comes from a secretion that buildds up between the head and the foreskin. As long as you don't let it build up to the point that you can see it (looks a little like ricotta cheese), there is no problem with it, though washing too often will dry out and iriitate the sensetive skin in there.
A very VERY important thing to consider before looking into circumcision it the nerves of the penis. There are highly sensative nerve clusters in the foreskin, and losing them will reduce your ability to feel sexual pleasure, the the nerve trauma can lead to erectile dysfunction. Add to that the change of complications (could lead to disfiguring scarring or nerve damage) and I'd say avoid circumcision.
Guys who had theirs done as infants really cannot give advice on this matter, unless you have one yourself, you can't really understand the foreskin's importance.
Without weighing in on the whole intact vs. cut issue, I do want to point out the penis odors are extremely common among men; one thing that is a big help to many is to regularly use a quality penis health cream (health professionals recommend Man1 Man Oil) that include vitamin A in its ingredients. Vitamin A has anti-bacterial properties that fight unwanted odor, and applying it topically to the penis in a health cream helps target it directly to the penis. Good luck!
Well if you're not already and are able to do it try pulling back the foreskin and washing it everyday. If you still have problems then you should talk to your doctor and consider all of the risks of surgery.
I had mine done when I was too young to remember by my parents, but yes, I think that if it's bothering you and smells and you are worried about it being healthy and clean, then it might be a good idea. However, it is totally your choice. I think that if someone makes a decision like that, that he should think about how he will feel about it in the future. Personally, if I were in your shoes, I definitely would, but that's just me.