The trailer looks like it's going to be nice. I'm no expert, but I would probably drill out and replace the rivets that have corrosion around them. It may be difficult to seal them from the outside, and eliminate them from corroding between the rivets and the hull. The paint removal looks like no fun at all, but you are certainly making good progress.