Stop in for a cup of coffee

Re: changing both
I'll disagree with that. Make one change at a time if you can.
When you change the amount of mechanical advance, it also changes the initial tension and the second spring engagement. That's why its two changes, even though its one adjustment.
That only affects the curve rate and at 2500 rpm it is all in anyway.