Neither right or wrong, I did the pinhole filling first, then drilled for c-locs. I did need to remove the c-locs when I did some painting, and they are somewhat a pain to remove the snap ring (there's propbably a trick that I missed). Easy to go back on, though. I just think it's easier to do the bulk of the pinhole filling and sanding up front.
jim