Whilst you are doing these jobs take the Starter Motor off and strip and clean it and bare the areas where it grounds to the engine making sure there's no corrosion,paint or grease there and the Positive pole connection is good and clean.
It's an often overlooked service point but can pay big dividend on engine starting.
HTH
