I don't think there is a long term solution without swapping out the cranks, specifically, the Cervelo/Rotor OEM cranks. With it being out of spec, I can see it causing the clicking noises if it is loose against one of the bearings. This was brought up many moons ago on this forum on another thread where the user noticed that he was continually getting clicking noises after he has replaced his bottom brackets. When he examined his crank spindle, there were heavy score marks and when he replaced his crankset, the clicking went away. I checked my own crankset and sure enough, when I removed them, mine had some abnormal scoring also. It wasn't as heavy as his but it was definitely pronounced. However, at the time of his posting, the popular fix for any creaking/clicking was to get an aftermarket BB. This probably was because this was all these manufacturers were releasing Press Fit and BBright aftermarket bottom brackets. Replacing the bottom bracket with an aftermarket one did make a lot of the creaking issues go away. However, the aftermarket BBs fixed the issues where the symptoms were creaking and not the staccato clicking noise that come from the crankset issue. I think people and even mechanics get it confused as to which sound is which. I've heard both noises and they are very different sounding. The BB creaking noise sounds more like walking on badly installed laminate floors, or riding on a wooden ship. The clicking noises that I heard from the crankset was more of tiny pebbles or sand hitting the windshield. It was a creak vs click.
For me, what definitely worked was swapping it out the cranks. I was fortunate to have a friend with the same crankset who never experienced issues and we did a straight swap. Once swapped, my bike stayed silent while his developed the click. On a side note, my bottom bracket was still plastic press-fits at the time, but was correctly installed with primer and loctite, and my friend had BBInfinite. After this revelation, I went ahead and just installed wheels mfg 24mm BB and installed shimano cranks instead since I wanted to go full shimano groupset.