Key stuck in drivers door on 190E!

[Merkey]

Everything was working fine.... Car came with only a round head valet key so I ordered a new master key from stealership...
That worked fine in all locks.
Then yesterday I used the valet to unlock the drivers door, and I could not get the key back out! After an frantic 20 mins it suddenenly released like nothing happened...
I was concerned that there was some grit in the lock so I flushed it with WD, and later I used the new Master key... that would not come out either... took me about 20 mins of jiggling and as before it suddenly released!
Now, I dont know if its connected but I am having problems with the power locks... sometimes they work and sometimes not... at the moment I am locked out of the trunk and gas cap!
Ideas?