Those are some good suggestions from Jamie, give those a try.

Perhaps try turning your slew rate down to 1*/1000rpm, that will greatly smooth out the top speed timing engagement.