Thank you also for your acceptance of my feedback and for the additional info. Loose spokes can certainly cause what you describe, including multiple clicks per rotation. Sometimes the clicks have the same rhythm (click...click.click) sometimes not.

Still need more info - Is the clicking generally in rhythm with wheel rotation, relatively constant (though irregular) or more in sync with the alternating pressure on the handlebars? The first two would strongly indicate a wheel issue. Tensioning the wheel properly would certainly be a good idea. I would not advise redoing the headset or doing any more work until you try the wheel swap.