Sorry John, but why do you need to drill the rivets out?
Remove the 2 nuts each side, where the scuttle attaches to the main body, under the knee rolls, then take out the retaining plates underneath. You can then just take the wiper arms off, run a knife over the silicone sealant under the bonnet, and then the whole lot will come off in one, with the screen attached.
You will also have to deal with anything routed via the scuttle, or attached to it, but it would seem an easier method to me.
More views welcome!