You need to change the mechanical advance in the distributor, NOT back down the initial timing so the total is still in bounds.
See where the car start with difficulty, if that's at 20+ so be it. Set the initial timing there or close and tailor mechanical to hit your total, NOT the other way around!