I agree. I loved the twist at the end, where you thought he was fine and then 'tap-tap-tap-tap' from Wilf.
The funny thing was, before the episode I kept saying, 'wouldn't it be funny if Wilf killed the Doctor?' And he did! (Apologies to anyone who hasn't seen it yet)