Great read here! Nice job so far and what you have planned should be really cool. I think I'd leave them rivets but I also know how the OCD kicks in while you're at it!
Although you're past the worst of it, HEAT is what'll help you the most with siezed fastners. Even a bottle of MAP gas will usually do the trick. Have you got a welder?