240Z with vinyl top

I'm in the process of removing the vinyl top from my '71. There was some rust up along the front windshield, and at the back, where the roof meets the hatch, but not too bad. As you can see the hatch was replaced with a newer black hatch, but luckily the car came with the original series I hatch, which I'll be swapping back on. For now, I'm painting the roof & hatch black, but not sure what I'll end up doing long term. Here's a pic: