Stop in for a cup of coffee

You could. I'd only change one or the other; especially since that's 3 changes.
Upping the initial would be my choice.
16* initial at 800 rpm
16* at 1400
34 at 2500