newbie question about strippping a frame

[sleazytiki]

Hey guys I am going to strip and repaint the frame this weekend. Most of the parts are in really good shape but I want to remove the shock mounts, and a few other pieces so I can scape away the surface rust and repaint them. Right now everything is still held in place with the factory rivets but I am not sure what to replace them with. I am figuring that grade 8 bolts would do the job but i was just curious if you guys had any better ideas.
Thanks!!