Thanks everyone! Well unfortunatly a VASS cert is never going to happen. They won't accept the bodywork, especially the taillights :(
So... after what I've read so far, all I need to change back to a 1.5L for roadworthy purposes would be a 1.5L motor and ECU, engine mounts, and passenger side...