Hi, Welcome to Health care magic forum.
As you describe it appears to be the chronic tonsillitis
. The recent finding might be the epiglottis
, it is common, you would have observed recently.
I advise you to consult an E.N.T. surgeon for diagnosis and treatment.
I usually prescribe to my patient with such symptoms erythromycin
I appreciate that you are trying to stop smoking
,stop it completely .
Wishing for a quick and complete recovery. Thank you.