[V8] Key won't release from steering lock

[M h]

1993 V8, 4.2
I am resurrecting yet another neglected V8, over here in the UK.
The ignition lock has 2 problems.  The big one being that I can no longer remove the key.  I've jiggled with the shift lever, between park, drive, neutral, etc. A problem with the ignition lock solenoid?
The other issue is that the key doesn't move from the 'start' position to the 'run' position when starting the engine.  It can be moved manually, though.

Are these two separate issues, or part of the same problem?

If you are interested, I'm running a thread with pictures on both AudiV8.com and Classic-Audi.co.uk.
This car is named the toxic toad.