Spend another day with the shrinking disc and the heat gun. The heat gun trick is freaking magic. I was able to really tighten the roof skin nicely, though I did venture a bit outside the repair area.
Today ended with a couple coats of etching primer, and tomorrow some filler.
