Forgot to add your intial timing looks about spot on. From the angles you posted it looks like you may have a skosh (and by skosh I mean maybe, maybe 2 degrees) too much total.

On pump gas you want the total line on the ground wire close to the shell. It's hard to tell how close you are in that picture, hence my skosh remark.