A much better episode, and I really liked seeing the Doctor operating on his own.

I think you've hit on something thats been a problem Clara slowly learns something she already knew
It seems that they've made her a completely different person than she was when travelling with the 11th Doctor - unless the script calls for her to remember.

I saw somewhere that Jamie Mathieson is also a stand up comedian, perhaps it helped!