[Early_S_Man]

That does sound like a worn ignition switch issue.

I suggest monitoring the Voltage present at the CDI connetor during the starting cycle. Pull the connector, connect test leads to Terminal #15 and a good, solid ground.