Ignition switch / Starter issues

I have been having some problems with my engine not starting (2005 150 Johnson).Some times is will crank, sometimes not, no clicking or anything. One second it will work , the next it won’t, then 2 tries later it works again, no pattern. Battery is good. I checked all my connections; + and ground(the best I could). I even pulled the starter and solenoid and had Carolina Auto Electric check them, they said they were both fine. I’m now looking at replacing the ignition switch… It has 6 wires running to it and all the switches I have found only have 5. The current switch has push to choke. Can I get by with a 5 wire switch? Anything else I should try before I take it to Chris V? - Confused…

“Czechmate”
Key West 20/20 CC
150 Johnson