James Gilby was 'the husband Diana wanted Charles to be'