Trigger settings are correct for the 36-1 setup with Tooth #1 @ 80deg BTDC yes so the advance is correct.
It's as the boost builds immediately after the gear change that it happens, so not totally off boost if you see what I mean?! lol