I'll second the vote for 'The Man Who haunted Himself'. A rare chance indeed to see Roger Moore actually acting, and very good he is too.
Yes there are a few holes in the plot, but not many. Overall it's a very good story very well handled.
Steve