So much better!
Turns out that some of the problem was lying with the old Rivet nut tool I was using. As you can see the new tool has a flare to it that acts as a centering guide. Just goes to show, you get what you pay for.
Now I just need to get access to a light and confirm fitment.