These made a huge difference in mine....
Going by your description I’d replace the ignition switch. Easy to do and those electrical contacts get operated the most.
Separate names with a comma.