i don't see why, when you have everything out, you wouldn't just swap EVERYTHING over including looms etc to save any unforseen electrical hassles. tis what i would do. the headlight wiring loom would be slightly different too with the s2 having the divorced highbeams