Dimpling C-01452 Canopy Clip (page 38-28 step 3)

I was about to dimple the canopy clips for CS4 rivets, but it appears the holes are undersized. These obviously get bent as you rivet them, so the angle of the dimple is probably not critical. I just want to confirm that I'm not working with the wrong part or anything before I dimple them (for AN470AD3 rivet heads) and match drill #30 to enlarge the hole in the clip as I drill it into the canopy skin.

Is that right? Or should I drill #30 the canopy clips and then dimple them for CS4 rivets before I separate them and match drill #30 to the canopy skin?

I went with the drill #30, then dimple CS4, then separate, debur, match drill #30 to canopy skin, and rivet into place. It worked out well enough.