I used a slightly different approach on my RV 6. I custom made the windscreen fairing from carbon and used Sikaflex to bond it in position. No rivets and very solid. Don't know if this is relevant to your installation so use as a data point only.
Painting a very slow build RV6