97 Impreza ignition issue

My 1997 subaru impreza won’t let go of my key. I can’t turn it all the way into the lock position. Previous to this problem, I seemed to be having a shift-lock problem where when I had a cold start I couldn’t take it out of park until it warmed up for a few minutes. When attempting to shift, pressing the shifter button would cause a clicking noise from behind the instrument panel. Now the sticky shifter and the panel noises are gone, but I would really like to be able to take my key out of the ignition.