I put a fiber optic camera into the cylinder this weekend. It's really hard to get it just right, but it looks like it's probably correct, at least within 4 degrees.
I think the distributor needs tuning to get the advance increasing more aggressively. Ah, this winter...