Glad to see you got everything worked out! I may have to do something similar (hopefully not) and would like to ask the folks with experience here how this would relate to the gearbox not "seating" into positions. I also can not get my key out, however my car starts just fine. I was glad to see this thread and how you were able to correct the problem, agreed that this is a major PITA!!

__________________
W210 1996 E300 - Daily
W126 1981 300SD - Nice weather
W111 1966 230S - Weddingmobile
AVPCAR 1999 Honda Si - Drag/Showcar
W111 1968 230S - Parts car