had same problem myself and rang niceic for advise they told me that you can use either as long as you say that it is to the requirements of BS7671:2004 and not BS7671:2008 include in the section about existing installation any non compliances with the 17th edition. cheers rob