Maybe too late now, but I’d recommend using closed end pop rivets, and to back this up an adhesive rubber sealing button, especially for any roof rivets.  The buttons go over the hole on the outside you then just push the rivet thru to button and it gets compressed down, that with the closed end rivets gives you a waterproof seal.