OK, I had/have the exact same problem, almost,
Job started in 2008, not finished yet,
I used it for my assessment last year, anything installed should be installed to the regulations in force at the time, but, the regs aren't retrospective, so the highly flammable CU under the stairs is fine, but circuits installed now must comply with amd3, note, I didn't say added, as it is the same installation , just not finished yet.
Basically, anything you install now must comply with 17th amd3, but anything installed preciously is fine.