Ignition Switch or Entire Assembly?

[gregkelley]

99 Boxster
Over the years, I've had the occasional issue where I had to jiggle the steering wheel in order to turn the key and start the car. Nothing big.
Monday of last week, I had to turn the key a couple of times to get it to start. I'd get a flash on the dash. I could still hear the click of the clutch switch. I chalked it up to just a gremlin.
Later last week, I had trouble turning the key enough to remove it. A couple of times I'd remove the key and the radio would still be on and the door would ding when I opened it (key removed). I could usually jiggle the key in the socket to get the car to sense it was removed.
Now, the car won't sense that the key is removed at all. Radio stays on, door dings.
So do I need to replace just the electric ignition switch or the steering lock mechanism as well? Sure, I can start with the switch but if that doesn't fix things, then I buy the entire assembly which also comes with a switch.