Hi Marty,
I went with the first option: move the roof forward so the back edges are flush.
I fitted the roof first and then positioned the bracing.
I also had to re-position the bolt because it was then too far forward.
I have attached a couple of pics. Just ignore the extra, *ahem*, ventilation holes in the hinge pic.
I also used a strip of adhesive foam stuck to the roof side to fill the gap. Seems to work well. That wall is the North wall and the rain rarely comes from that direction where I am.
cheers,
Andrew