SAAB 9-5 Vector Sport Estate 1.9Tdi, 2008. 101000 miles
I'd been having problems, with increasing frequency of the car electrics not switching off when the key removed from the ignition barrel. Doors not unlocking, remote not working and so on. Misbehaving interior light and radio, etc. The car seems to believe there is still a key in the switch. It finally gave up the ghost and now the remotes don't work at all. Interior light stays on when doors closed and locked (flat battery

). I need to fix this.
Wasn't sure if it was the ignition barrel itself or the switch below it it failing, so this morning started to investigate.
Removed the ignition barrel, which exposes the electrical switch below. Using a screwdriver I established that this switch moves up and down freely, and if turned (with a big bladed screwdriver), hey presto, remotes work, doors lock properly and so on. Which led me to the conclusion it's the ignition switch itself. Had a good look at it, and whilst all seems fine I finally understood that it's not popping up like it should. Hard to explain but there's a pin that runs up a ramp when the key is turned. When the key is removed this pin is supposed to slide sideways (towards the centre of the barrel) to allow the barrel to pop up.
However, it looks like the housing around this pin is sufficiently worn to stop the pin moving freely, so barrel no longer pops up, and subsequently the electric switch below not is being allowed to operate.
It would seem, therefore, that I need a new ignition switch.

What are my options? I'm guessing new switch would come with keys, but then door locks would need changing? Immobiliser? Remote key fobs? Anyone else faced with this, and what did you do?
Help!!