hello your symptoms are similar to an ingrown hair follicle as i remember my fiance having one..keep it clean with salt solution washes and the smell you mention sounds like its infected see your doctor.
sometimes they do clear on their own.