I know this has been touched on/mulled over in previous threads but not sure what anyone has actually done about it.
I am lucky in that the original self-tapper holes seem intact and intended to buy some stainless steel ones.
But I have come across some plated ones just the right size with pan-head which I plan to fit using a dab of Waxoyl.
One of tomorrow's jobs so are there any alternative suggestions out there?

I went down the rivet route Peter. I thought it was less likely to damage the paintwork and looks much neater.

morning Peter;
When I had to refit my sun-roof I decided to use 'rivnuts' instead of self-tapping screws or 'blind' rivets. I found that 5mm rivnuts were just about correct along with 'button head' cap-head (allen key) bolts. Doing it this way makes it easier to remove the soft-top if required. I also covered the edges of the rivnuts with a waterproof tape to ensure that they were completely sealed. 'Button-head' bolts have a low, rounded head with no sharp or raised edges. Rivnuts can be obtained from 'MEMFAST' and are hollow, internally threaded inserts---they sell them in steel, alloy and stainless variants.

Two good options but I want to avoid aluminium because it will lead to electrolytic corrosion and I guess rivnuts means drilling bigger holes so a solution maybe better reserved for when wear and tear takes hold
Still thinking...