You are better off to just rewire the place.
Save yourself the pain down the track.
Do it once, do it properly.

This is one of the reasons why self-certification is good, you don't have people doing dodgy work that they have to sign for.